Hide libpci pkg-config request behind use_libpci==1

This allows platforms that don't have libpci to configure the code without error. BUG=560948 Change-Id: I155f35108d9be193afed5304b443a6afdf33b077 Reviewed-on: https://chromium-review.googlesource.com/314300Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Stephen Mcgruer <smcgruer@google.com> Tested-by: Jamie Madill <jmadill@chromium.org>

Hide libpci pkg-config request behind use_libpci==1
faaa84ac · Stephen McGruer · Jamie Madill · 183d7e24 · faaa84ac · faaa84ac
Commit faaa84ac authored Nov 24, 2015 by Stephen McGruer Committed by Jamie Madill Nov 25, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

common_defines.gypi build/common_defines.gypi +1 -0

deqp.gypi src/tests/deqp.gypi +3 -1

No files found.
--- a/build/common_defines.gypi
+++ b/build/common_defines.gypi
@@ -6,6 +6,7 @@
    'variables':
    {
        'component%': 'static_library',
+        'use_libpci%': 1,
        'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.1',
        # build/gyp_angle sets this to 1.
        'angle_standalone%': '0',

--- a/src/tests/deqp.gypi
+++ b/src/tests/deqp.gypi
@@ -1529,7 +1529,9 @@
                        'conditions':
                        [
-                            ['OS=="linux"',
+                            # NOTE(smcgruer): Guarding with use_libpci allows gyp to run successfully
+                            # on systems without libpci, but the test targets will not compile or link.
+                            ['OS=="linux" and use_libpci==1',
                            {
                                'ldflags':
                                [