diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 22:04:02 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 22:04:02 +0000 |
| commit | 2c6f51d3b6adac62075b3427d2cffdf77718315d (patch) | |
| tree | 642c9218482ce5faa919489187f39757efae0aa1 /third_party | |
| parent | 7ca1273a8ea05984b1f9dcccba3d19743b087f12 (diff) | |
| download | chromium_src-2c6f51d3b6adac62075b3427d2cffdf77718315d.zip chromium_src-2c6f51d3b6adac62075b3427d2cffdf77718315d.tar.gz chromium_src-2c6f51d3b6adac62075b3427d2cffdf77718315d.tar.bz2 | |
Make sure the 'use_system_*' variables are actually visible in the relevant gyp files.
BUG=29738
Review URL: http://codereview.chromium.org/479005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/bzip2/bzip2.gyp | 9 | ||||
| -rw-r--r-- | third_party/libjpeg/libjpeg.gyp | 9 | ||||
| -rw-r--r-- | third_party/libpng/libpng.gyp | 9 | ||||
| -rw-r--r-- | third_party/libxslt/libxslt.gyp | 7 | ||||
| -rw-r--r-- | third_party/zlib/zlib.gyp | 9 |
5 files changed, 38 insertions, 5 deletions
diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp index 8bf3b31..c0f36e0 100644 --- a/third_party/bzip2/bzip2.gyp +++ b/third_party/bzip2/bzip2.gyp @@ -4,7 +4,14 @@ { 'variables': { - 'use_system_bzip2%': 0, + 'conditions': [ + [ 'OS=="linux"', { + # Link to system .so since we already use it due to GTK. + 'use_system_bzip2%': 1, + }, { # OS!="linux" + 'use_system_bzip2%': 0, + }], + ], }, 'conditions': [ ['use_system_bzip2==0', { diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp index c0259d6..1b0798b 100644 --- a/third_party/libjpeg/libjpeg.gyp +++ b/third_party/libjpeg/libjpeg.gyp @@ -4,7 +4,14 @@ { 'variables': { - 'use_system_libjpeg%': 0, + 'conditions': [ + [ 'OS=="linux"', { + # Link to system .so since we already use it due to GTK. + 'use_system_libjpeg%': 1, + }, { # OS!="linux" + 'use_system_libjpeg%': 0, + }], + ], }, 'conditions': [ ['use_system_libjpeg==0', { diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp index 6093d5f..1387b18 100644 --- a/third_party/libpng/libpng.gyp +++ b/third_party/libpng/libpng.gyp @@ -4,7 +4,14 @@ { 'variables': { - 'use_system_libpng%': 0, + 'conditions': [ + [ 'OS=="linux"', { + # Link to system .so since we already use it due to GTK. + 'use_system_libpng%': 1, + }, { # OS!="linux" + 'use_system_libpng%': 0, + }], + ], }, 'conditions': [ ['use_system_libpng==0', { diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp index 1f62810..4a8f812 100644 --- a/third_party/libxslt/libxslt.gyp +++ b/third_party/libxslt/libxslt.gyp @@ -8,8 +8,13 @@ ['OS=="linux" or OS=="freebsd"', {'os_include': 'linux'}], ['OS=="mac"', {'os_include': 'mac'}], ['OS=="win"', {'os_include': 'win32'}], + [ 'OS=="linux"', { + # Link to system .so since we already use it due to GTK. + 'use_system_libxslt%': 1, + }, { # OS!="linux" + 'use_system_libxslt%': 0, + }], ], - 'use_system_libxslt%': 0, }, 'targets': [ { diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp index 44e1f8b..36613a7 100644 --- a/third_party/zlib/zlib.gyp +++ b/third_party/zlib/zlib.gyp @@ -4,7 +4,14 @@ { 'variables': { - 'use_system_zlib%': 0, + 'conditions': [ + [ 'OS=="linux"', { + # Link to system .so since we already use it due to GTK. + 'use_system_zlib%': 1, + }, { # OS!="linux" + 'use_system_zlib%': 0, + }], + ], }, 'conditions': [ ['use_system_zlib==0', { |