diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-05-05 20:01:41 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2014-05-06 16:19:43 +0200 |
commit | 2d4f839849d8de907d3addd09a0682a53bf47c6a (patch) | |
tree | d4305a2e5f184c8377af8916aee7d6713ff9eeca | |
parent | 5a97ad8d88cd71d70f5ff30eb37446ac5cea32fd (diff) | |
download | qtwebengine-chromium-2d4f839849d8de907d3addd09a0682a53bf47c6a.tar.gz |
Remove pkg-config libpci and icu-config
This should be squashed into the patch:
"Adjust gyp defines for eLinux"
Change-Id: If31516e8fe6f3c1bbd25a92d941d8627d5fb061d
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
-rw-r--r-- | chromium/build/linux/system.gyp | 4 | ||||
-rw-r--r-- | chromium/third_party/icu/icu.gyp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/chromium/build/linux/system.gyp b/chromium/build/linux/system.gyp index 92c74805bb8..2a2c8bd5765 100644 --- a/chromium/build/linux/system.gyp +++ b/chromium/build/linux/system.gyp @@ -506,6 +506,8 @@ { 'target_name': 'libpci', 'type': 'static_library', + 'conditions': [ + ['use_x11==1', { 'cflags': [ '<!@(<(pkg-config) --cflags libpci)', ], @@ -566,6 +568,8 @@ 'process_outputs_as_sources': 1, }, ], + }], + ], }, { 'target_name': 'libresolv', diff --git a/chromium/third_party/icu/icu.gyp b/chromium/third_party/icu/icu.gyp index 4d8259af005..416050d66d8 100644 --- a/chromium/third_party/icu/icu.gyp +++ b/chromium/third_party/icu/icu.gyp @@ -642,6 +642,8 @@ ], }, },{ # OS!="android" + 'conditions': [ + ['qt_os!="embedded_linux"', { 'link_settings': { 'ldflags': [ '<!@(icu-config --ldflags)', @@ -650,6 +652,8 @@ '<!@(icu-config --ldflags-libsonly)', ], }, + }], + ], }], ], }, |