diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 16:30:39 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 16:30:39 +0000 |
| commit | 82f1f54157c4f5e1ed89c37248e49b7922ba1399 (patch) | |
| tree | f6e4260750fe64f37359e6d54a8c1f2bd1914225 /build | |
| parent | a8843c5d4d75234a31c56d47f6c653bdfd0473ce (diff) | |
| download | chromium_src-82f1f54157c4f5e1ed89c37248e49b7922ba1399.zip chromium_src-82f1f54157c4f5e1ed89c37248e49b7922ba1399.tar.gz chromium_src-82f1f54157c4f5e1ed89c37248e49b7922ba1399.tar.bz2 | |
linux: Explicitly include gmodule-2.0 in the list for glib/gtk dependency.
BUG=115799
TEST=bots remain non-grumpy
Review URL: https://chromiumcodereview.appspot.com/9649022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/linux/system.gyp | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 60a438c..caf5062 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -32,33 +32,38 @@ 'target_name': 'gtk', 'type': 'none', 'toolsets': ['host', 'target'], + 'variables': { + # gtk requires gmodule, but it does not list it as a dependency in some + # misconfigured systems. + 'gtk_packages': 'gmodule-2.0 gtk+-2.0 gthread-2.0', + }, 'conditions': [ ['_toolset=="target"', { 'direct_dependent_settings': { 'cflags': [ - '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)', + '<!@(<(pkg-config) --cflags <(gtk_packages))', ], }, 'link_settings': { 'ldflags': [ - '<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)', + '<!@(<(pkg-config) --libs-only-L --libs-only-other <(gtk_packages))', ], 'libraries': [ - '<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)', + '<!@(<(pkg-config) --libs-only-l <(gtk_packages))', ], }, }, { 'direct_dependent_settings': { 'cflags': [ - '<!@(pkg-config --cflags gtk+-2.0 gthread-2.0)', + '<!@(pkg-config --cflags <(gtk_packages))', ], }, 'link_settings': { 'ldflags': [ - '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)', + '<!@(pkg-config --libs-only-L --libs-only-other <(gtk_packages))', ], 'libraries': [ - '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)', + '<!@(pkg-config --libs-only-l <(gtk_packages))', ], }, }], @@ -494,33 +499,36 @@ 'target_name': 'glib', 'type': 'none', 'toolsets': ['host', 'target'], + 'variables': { + 'glib_packages': 'glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0', + }, 'conditions': [ ['_toolset=="target"', { 'direct_dependent_settings': { 'cflags': [ - '<!@(<(pkg-config) --cflags glib-2.0 gobject-2.0 gthread-2.0)', + '<!@(<(pkg-config) --cflags <(glib_packages))', ], }, 'link_settings': { 'ldflags': [ - '<!@(<(pkg-config) --libs-only-L --libs-only-other glib-2.0 gobject-2.0 gthread-2.0)', + '<!@(<(pkg-config) --libs-only-L --libs-only-other <(glib_packages))', ], 'libraries': [ - '<!@(<(pkg-config) --libs-only-l glib-2.0 gobject-2.0 gthread-2.0)', + '<!@(<(pkg-config) --libs-only-l <(glib_packages))', ], }, }, { 'direct_dependent_settings': { 'cflags': [ - '<!@(pkg-config --cflags glib-2.0 gobject-2.0 gthread-2.0)', + '<!@(pkg-config --cflags <(glib_packages))', ], }, 'link_settings': { 'ldflags': [ - '<!@(pkg-config --libs-only-L --libs-only-other glib-2.0 gobject-2.0 gthread-2.0)', + '<!@(pkg-config --libs-only-L --libs-only-other <(glib_packages))', ], 'libraries': [ - '<!@(pkg-config --libs-only-l glib-2.0 gobject-2.0 gthread-2.0)', + '<!@(pkg-config --libs-only-l <(glib_packages))', ], }, }], |