diff options
| author | Rene Engelhard <rene@debian.org> | 2015-04-11 17:28:35 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2015-04-12 10:21:06 +0200 |
| commit | e3ebd11ff7bab15bdedcd9e2b7bbe1092b038167 (patch) | |
| tree | dcb58f6508c521c456d09950c2b72c7953337e82 | |
| parent | 7af58bf79dd578afb3844ee0d53a3b7131c37433 (diff) | |
fix internal icu build on armhf (taken from Debians icu package)
Change-Id: Ib287799906e234ce795a0f9ded5cdeebcdffba4e
| -rw-r--r-- | external/icu/UnpackedTarball_icu.mk | 1 | ||||
| -rw-r--r-- | external/icu/icu4c-icudata-stdlibs.diff | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index fb08c8d925ab..774eb10bdad2 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/icu.changeset_36724.patch.1 \ external/icu/icu.changeset_36727.patch.1 \ external/icu/icu.changeset_36801.patch.1 \ + external/icu/icu4c-icudata-stdlibs.diff \ )) # vim: set noet sw=4 ts=4: diff --git a/external/icu/icu4c-icudata-stdlibs.diff b/external/icu/icu4c-icudata-stdlibs.diff new file mode 100644 index 000000000000..16bea7b4a995 --- /dev/null +++ b/external/icu/icu4c-icudata-stdlibs.diff @@ -0,0 +1,15 @@ +Index: icu-52~m1/source/config/mh-linux +=================================================================== +--- build/icu-52~m1.orig/source/config/mh-linux 2013-09-14 18:53:23.284040467 -0400 ++++ build/icu-52~m1/source/config/mh-linux 2013-09-14 18:53:23.284040467 -0400 +@@ -21,7 +21,9 @@ + RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN' + + ## These are the library specific LDFLAGS +-LDFLAGSICUDT=-nodefaultlibs -nostdlib ++#LDFLAGSICUDT=-nodefaultlibs -nostdlib ++# Debian change: linking icudata as data only causes too many problems. ++LDFLAGSICUDT= + + ## Compiler switch to embed a library name + # The initial tab in the next line is to prevent icu-config from reading it. |