diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 18:08:50 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 18:08:50 +0000 |
| commit | d2976b5f3c63a5059d361a05ebd6c4fa0cb53a6e (patch) | |
| tree | 05dbd35b13b4541b539611ed8578efa7d31b6e2d /third_party | |
| parent | 63c73a41a18228493aa443243edb5082b667d50b (diff) | |
| download | chromium_src-d2976b5f3c63a5059d361a05ebd6c4fa0cb53a6e.zip chromium_src-d2976b5f3c63a5059d361a05ebd6c4fa0cb53a6e.tar.gz chromium_src-d2976b5f3c63a5059d361a05ebd6c4fa0cb53a6e.tar.bz2 | |
Linux: fix up use_system_{libxml,libxslt,sqlite3}
http://codereview.chromium.org/164450
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libxml/libxml.gyp | 10 | ||||
| -rw-r--r-- | third_party/libxslt/libxslt.gyp | 7 | ||||
| -rw-r--r-- | third_party/sqlite/sqlite.gyp | 13 |
3 files changed, 24 insertions, 6 deletions
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp index 84fb755..50528ad 100644 --- a/third_party/libxml/libxml.gyp +++ b/third_party/libxml/libxml.gyp @@ -22,12 +22,18 @@ 'type': 'settings', 'direct_dependent_settings': { 'cflags': [ - '<!@(python ../../build/linux/pkg_config_wrapper.py --cflags libxml-2.0)', + '<!@(pkg-config --cflags libxml-2.0)', + ], + 'defines': [ + 'USE_SYSTEM_LIBXML', ], }, 'link_settings': { + 'ldflags': [ + '<!@(pkg-config --libs-only-L --libs-only-other libxml-2.0)', + ], 'libraries': [ - '<!@(python ../../build/linux/pkg_config_wrapper.py --libs libxml-2.0)', + '<!@(pkg-config --libs-only-l libxml-2.0)', ], }, }, { # else: OS != "linux" or ! use_system_libxml diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp index f775d4b..76f6091 100644 --- a/third_party/libxslt/libxslt.gyp +++ b/third_party/libxslt/libxslt.gyp @@ -22,12 +22,15 @@ 'type': 'settings', 'direct_dependent_settings': { 'cflags': [ - '<!@(python ../../build/linux/pkg_config_wrapper.py --cflags libxslt)', + '<!@(pkg-config --cflags libxslt)', ], }, 'link_settings': { + 'ldflags': [ + '<!@(pkg-config --libs-only-L --libs-only-other libxslt)', + ], 'libraries': [ - '<!@(python ../../build/linux/pkg_config_wrapper.py --libs libxslt)', + '<!@(pkg-config --libs-only-l libxslt)', ], }, }, { # else: OS != "linux" or ! use_system_libxslt diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp index a725754..4a4d869 100644 --- a/third_party/sqlite/sqlite.gyp +++ b/third_party/sqlite/sqlite.gyp @@ -5,6 +5,7 @@ { 'variables': { 'use_system_sqlite%': 0, + 'required_sqlite_version': '3.6.1', }, 'includes': [ '../../build/common.gypi', @@ -27,12 +28,20 @@ 'type': 'settings', 'direct_dependent_settings': { 'cflags': [ - '<!@(python ../../build/linux/pkg_config_wrapper.py --cflags sqlite)', + '<!@(pkg-config --cflags --atleast-version=<(required_sqlite_version) sqlite3)', + ], + }, + 'direct_dependent_settings': { + 'defines': [ + 'USE_SYSTEM_SQLITE', ], }, 'link_settings': { + 'ldflags': [ + '<!@(pkg-config --atleast-version=<(required_sqlite_version) --libs-only-L --libs-only-other sqlite3)', + ], 'libraries': [ - '<!@(python ../../build/linux/pkg_config_wrapper.py --libs sqlite)', + '<!@(pkg-config --atleast-version=<(required_sqlite_version) --libs-only-l sqlite3)', ], }, }, { # else: OS != "linux" or ! use_system_sqlite |