diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-16 21:32:10 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-16 21:32:10 +0000 |
| commit | c3b6b4360d3f0987d87308ea1bd2ae636ffa230f (patch) | |
| tree | bd1d7967a9c123866308fd93c103ed4d934335cb | |
| parent | 2787f4b7cf4e0fe407829351c8ee747ee4bfd188 (diff) | |
| download | chromium_src-c3b6b4360d3f0987d87308ea1bd2ae636ffa230f.zip chromium_src-c3b6b4360d3f0987d87308ea1bd2ae636ffa230f.tar.gz chromium_src-c3b6b4360d3f0987d87308ea1bd2ae636ffa230f.tar.bz2 | |
Linux: switch to using pkg-config for unbundled ICU
This was recommended by upstream ICU developer in https://ssl.icu-project.org/trac/ticket/6102
and should avoid issues with contaminated flags in icu-config.
BUG=none
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/26723003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228979 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/linux/unbundle/icu.gyp | 52 |
1 files changed, 38 insertions, 14 deletions
diff --git a/build/linux/unbundle/icu.gyp b/build/linux/unbundle/icu.gyp index 1e84bb2..16c36df 100644 --- a/build/linux/unbundle/icu.gyp +++ b/build/linux/unbundle/icu.gyp @@ -5,35 +5,45 @@ { 'targets': [ { - 'target_name': 'system_icu', + 'target_name': 'icudata', 'type': 'none', - 'toolsets': ['host', 'target'], 'direct_dependent_settings': { + 'cflags': [ + '<!@(pkg-config --cflags icu-uc)', + ], 'defines': [ 'U_USING_ICU_NAMESPACE=0', ], }, 'link_settings': { 'ldflags': [ - '<!@(icu-config --ldflags)', + '<!@(pkg-config --libs-only-L --libs-only-other icu-uc)', ], 'libraries': [ - '<!@(icu-config --ldflags-libsonly)', + '<!@(pkg-config --libs-only-l icu-uc)', ], }, }, { - 'target_name': 'icudata', - 'type': 'none', - 'dependencies': ['system_icu'], - 'export_dependent_settings': ['system_icu'], - }, - { 'target_name': 'icui18n', 'type': 'none', 'toolsets': ['host', 'target'], - 'dependencies': ['system_icu'], - 'export_dependent_settings': ['system_icu'], + 'direct_dependent_settings': { + 'cflags': [ + '<!@(pkg-config --cflags icu-i18n)', + ], + 'defines': [ + 'U_USING_ICU_NAMESPACE=0', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(pkg-config --libs-only-L --libs-only-other icu-i18n)', + ], + 'libraries': [ + '<!@(pkg-config --libs-only-l icu-i18n)', + ], + }, 'variables': { 'headers_root_path': 'source/i18n', 'header_filenames': [ @@ -119,8 +129,22 @@ 'target_name': 'icuuc', 'type': 'none', 'toolsets': ['host', 'target'], - 'dependencies': ['system_icu'], - 'export_dependent_settings': ['system_icu'], + 'direct_dependent_settings': { + 'cflags': [ + '<!@(pkg-config --cflags icu-uc)', + ], + 'defines': [ + 'U_USING_ICU_NAMESPACE=0', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(pkg-config --libs-only-L --libs-only-other icu-uc)', + ], + 'libraries': [ + '<!@(pkg-config --libs-only-l icu-uc)', + ], + }, 'variables': { 'headers_root_path': 'source/common', 'header_filenames': [ |