Linux: add option to link libpci directly instead of using dlopen.

Linux: add option to link libpci directly instead of using dlopen.

This is for Linux distros, so they can detect more breakages
at compile time and using automated tools.

BUG=none
TEST=none


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=165482

[Paweł Hajdan Jr., 2012-10-29 17:17:00]

Please review:

zmo: everything
piman: OWNERS

[piman, 2012-10-29 17:24:24]

https://codereview.chromium.org/11343015/diff/2001/content/content_gpu.gypi
File content/content_gpu.gypi (right):

https://codereview.chromium.org/11343015/diff/2001/content/content_gpu.gypi#n...
content/content_gpu.gypi:122: '<!@(pkg-config --cflags libpci)',
This won't work if you have a sysroot. Best is to move this to
build/linux/system.gyp as a 'none' target and follow the pattern there.

https://codereview.chromium.org/11343015/diff/2001/content/gpu/gpu_info_colle...
File content/gpu/gpu_info_collector_linux.cc (right):

https://codereview.chromium.org/11343015/diff/2001/content/gpu/gpu_info_colle...
content/gpu/gpu_info_collector_linux.cc:13: #include <pci/pci.h>
This won't work correctly if you didn't have the proper -I especially in the
sysroot case (e.g. chrome os).

https://codereview.chromium.org/11343015/diff/2001/content/gpu/gpu_info_colle...
content/gpu/gpu_info_collector_linux.cc:105: interface->pci_alloc =
reinterpret_cast<FT_pci_alloc>(
Why do we need reinterpret_cast here?

[Paweł Hajdan Jr., 2012-10-29 17:54:06]

PTAL

[piman, 2012-10-29 18:03:48]

LGTM for my parts, but please have zmo vet this.

[Zhenyao Mo, 2012-10-29 21:39:08]

LGTM

https://codereview.chromium.org/11343015/diff/8001/content/gpu/gpu_info_colle...
File content/gpu/gpu_info_collector_linux.cc (right):

https://codereview.chromium.org/11343015/diff/8001/content/gpu/gpu_info_colle...
content/gpu/gpu_info_collector_linux.cc:77: PciInterface* interface = new struct
PciInterface;
Nit: this can be outside the #if branches.

[Paweł Hajdan Jr., 2012-10-29 23:06:44]

http://codereview.chromium.org/11343015/diff/8001/content/gpu/gpu_info_collec...
File content/gpu/gpu_info_collector_linux.cc (right):

http://codereview.chromium.org/11343015/diff/8001/content/gpu/gpu_info_collec...
content/gpu/gpu_info_collector_linux.cc:77: PciInterface* interface = new struct
PciInterface;
On 2012/10/29 21:39:08, Zhenyao Mo wrote:
> Nit: this can be outside the #if branches.

Done. Note I used scoped_ptr to avoid leaks.

[Zhenyao Mo, 2012-10-29 23:09:38]

LGTM

[commit-bot: I haz the power, 2012-11-01 00:01:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/11343015/9008

[commit-bot: I haz the power, 2012-11-01 00:01:55]

Failed to apply patch for build/install-build-deps.sh:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/install-build-deps.sh
  Hunk #1 FAILED at 61.
  Hunk #2 FAILED at 82.
  2 out of 2 hunks FAILED -- saving rejects to file
build/install-build-deps.sh.rej

Patch:       build/install-build-deps.sh
Index: build/install-build-deps.sh
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index
210d6cccb41e0f5ab08f828f51879a4a6e80702c..427e888d3aaec678f76214c91d8b20e867725f5f
100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -61,13 +61,12 @@ dev_list="apache2.2-bin bison curl elfutils fakeroot flex
g++ gperf
           libcairo2-dev libcups2-dev libcurl4-gnutls-dev libelf-dev
           libgconf2-dev libgl1-mesa-dev libglib2.0-dev libglu1-mesa-dev
           libgnome-keyring-dev libgtk2.0-dev libkrb5-dev libnspr4-dev
-          libnss3-dev libpam0g-dev libsctp-dev libsqlite3-dev libssl-dev
-          libudev-dev libwww-perl libxslt1-dev libxss-dev libxt-dev libxtst-dev
-          mesa-common-dev patch perl php5-cgi pkg-config python
python-cherrypy3
-          python-dev python-psutil rpm ruby subversion ttf-dejavu-core
-          ttf-indic-fonts ttf-kochi-gothic ttf-kochi-mincho ttf-thai-tlwg wdiff
-          git-core
-          $chromeos_dev_list"
+          libnss3-dev libpam0g-dev libpci-dev libsctp-dev libsqlite3-dev
+          libssl-dev libudev-dev libwww-perl libxslt1-dev libxss-dev libxt-dev
+          libxtst-dev mesa-common-dev patch perl php5-cgi pkg-config python
+          python-cherrypy3 python-dev python-psutil rpm ruby subversion
+          ttf-dejavu-core ttf-indic-fonts ttf-kochi-gothic ttf-kochi-mincho
+          ttf-thai-tlwg wdiff git-core $chromeos_dev_list"
 
 # 64-bit systems need a minimum set of 32-bit compat packages for the pre-built
 # NaCl binaries. These are always needed, regardless of whether or not we want
@@ -82,7 +81,7 @@ chromeos_lib_list="libpulse0 libbz2-1.0 libcurl4-gnutls-dev"
 # Full list of required run-time libraries
 lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libcups2 libexpat1
           libfontconfig1 libfreetype6 libglib2.0-0 libgnome-keyring0
-          libgtk2.0-0 libpam0g libpango1.0-0 libpcre3 libpixman-1-0
+          libgtk2.0-0 libpam0g libpango1.0-0 libpci3 libpcre3 libpixman-1-0
           libpng12-0 libstdc++6 libsqlite3-0 libudev0 libx11-6 libxau6 libxcb1
           libxcomposite1 libxcursor1 libxdamage1 libxdmcp6 libxext6 libxfixes3
           libxi6 libxinerama1 libxrandr2 libxrender1 libxtst6 zlib1g

[commit-bot: I haz the power, 2012-11-01 17:26:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/11343015/12002

[commit-bot: I haz the power, 2012-11-01 20:08:50]

Change committed as 165482

[jam, 2012-11-01 21:04:57]

I just synced and now I get:

../../content/gpu/gpu_info_collector_linux.cc:13:21: error: pci/pci.h: No such
file or directory

Is there something that I need to run to get this?

[piman, 2012-11-01 21:08:36]

On Thu, Nov 1, 2012 at 2:04 PM, <jam@chromium.org> wrote:

> I just synced and now I get:
>
> ../../content/gpu/gpu_info_**collector_linux.cc:13:21: error: pci/pci.h:
> No such
> file or directory
>
> Is there something that I need to run to get this?
>

build/install-build-deps.sh should fix it.

Pawel: could you send a PSA to chromium-dev?

Thanks,
Antoine


>
https://chromiumcodereview.**appspot.com/11343015/<https://chromiumcodereview...
>

[Paweł Hajdan Jr., 2012-11-01 21:12:30]

PSA sent. John, sorry about the surprise build failure, now the change is
announced. Please let me know if problems continue after running
install-build-deps.sh

[jam, 2012-11-01 21:33:10]

that worked,t hanks

On Thu, Nov 1, 2012 at 2:12 PM, <phajdan.jr@chromium.org> wrote:

> PSA sent. John, sorry about the surprise build failure, now the change is
> announced. Please let me know if problems continue after running
> install-build-deps.sh
>
>
https://chromiumcodereview.**appspot.com/11343015/<https://chromiumcodereview...
>