Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1875)

Unified Diff: build/linux/unbundle/icu.gyp

Issue 26723003: Linux: switch to using pkg-config for unbundled ICU (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/unbundle/icu.gyp
diff --git a/build/linux/unbundle/icu.gyp b/build/linux/unbundle/icu.gyp
index 1e84bb2a1c248b7439033268e6ffe14cf5c504e2..16c36df5ae5da6492e253c2a5f572596acbffb9c 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': [
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698