diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 07:51:53 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 07:51:53 +0000 |
| commit | 60206383d853e767efc47e5bbb271bc567f2bfc1 (patch) | |
| tree | 91cb9ff64ad2a0eea0bb4b02c3c18ed137f32017 /build/linux | |
| parent | 671c970383eb08d52cf44a14815df1c6acea9bf2 (diff) | |
| download | chromium_src-60206383d853e767efc47e5bbb271bc567f2bfc1.zip chromium_src-60206383d853e767efc47e5bbb271bc567f2bfc1.tar.gz chromium_src-60206383d853e767efc47e5bbb271bc567f2bfc1.tar.bz2 | |
Linux: move dbus-glib target to chromeos-specific section,
to avoid introducing unnecessary build-time dependency
on non-chromeos Linux.
This has been raised as Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=434346
and I've confirmed the problem and the fix.
TEST=none
BUG=none
Review URL: https://chromiumcodereview.appspot.com/10977036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/system.gyp | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 98733c6..e36e558 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -112,7 +112,28 @@ ], }, ], # targets - }] # chromeos==0 + }, { # chromeos==1 + 'targets': [ + { + # TODO(satorux): Remove this once dbus-glib clients are gone. + 'target_name': 'dbus-glib', + 'type': 'none', + 'direct_dependent_settings': { + 'cflags': [ + '<!@(<(pkg-config) --cflags dbus-glib-1)', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)', + ], + 'libraries': [ + '<!@(<(pkg-config) --libs-only-l dbus-glib-1)', + ], + }, + }, + ], + }] ], # conditions 'targets': [ { @@ -477,24 +498,6 @@ }, }, { - # TODO(satorux): Remove this once dbus-glib clients are gone. - 'target_name': 'dbus-glib', - 'type': 'none', - 'direct_dependent_settings': { - 'cflags': [ - '<!@(<(pkg-config) --cflags dbus-glib-1)', - ], - }, - 'link_settings': { - 'ldflags': [ - '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)', - ], - 'libraries': [ - '<!@(<(pkg-config) --libs-only-l dbus-glib-1)', - ], - }, - }, - { 'target_name': 'glib', 'type': 'none', 'toolsets': ['host', 'target'], |