diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-05-06 17:18:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-07 14:33:43 +0200 |
| commit | 8a45662b7eb920b4070d1c3f62684ab37ae73adb (patch) | |
| tree | d1e22dec100368090da3ca9658decd3ad5aaaad5 /patches/chromium/third_party/icu | |
| parent | 3339e2857ecd574cca5b5f96c3a2bb7fa7b5dfc5 (diff) | |
Remove icu-config workaround and add libraries for eLinux
We require that the icu libs are in the default library
seach path since we build embedded with use_system_icu=1.
This patch also updates the chromium patches and the
shasum of the submodule.
Change-Id: Ica43fa45e9f5eac712019f5437bb9fde0896e49a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'patches/chromium/third_party/icu')
| -rw-r--r-- | patches/chromium/third_party/icu/0001-Do-not-use-icu-config-on-eLinux.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/chromium/third_party/icu/0001-Do-not-use-icu-config-on-eLinux.patch b/patches/chromium/third_party/icu/0001-Do-not-use-icu-config-on-eLinux.patch new file mode 100644 index 000000000..c330325a7 --- /dev/null +++ b/patches/chromium/third_party/icu/0001-Do-not-use-icu-config-on-eLinux.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Andras Becsi <andras.becsi@digia.com> +Date: Tue, 6 May 2014 17:05:55 +0200 +Subject: Do not use icu-config on eLinux + +We require that the icu libs are in the default library seach path. +--- + icu.gyp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/icu.gyp b/icu.gyp +index 4d8259a..416050d 100644 +--- a/icu.gyp ++++ b/icu.gyp +@@ -642,6 +642,8 @@ + ], + }, + },{ # OS!="android" ++ 'conditions': [ ++ ['qt_os!="embedded_linux"', { + 'link_settings': { + 'ldflags': [ + '<!@(icu-config --ldflags)', +@@ -650,6 +652,8 @@ + '<!@(icu-config --ldflags-libsonly)', + ], + }, ++ }], ++ ], + }], + ], + }, |