diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-21 01:28:32 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-21 01:51:18 +0200 |
| commit | 190ddfcdb2ffe445be00285a10df6af22a99d6a4 (patch) | |
| tree | 8202a81d94e5ee2d85c0e143e2d94a4666462e53 /icu | |
| parent | 8731f2554918fe7572f78a21d4b0521d6f27efe4 (diff) | |
Don't use any major version soname suffix for Android
But... the names our ICU libraries get built as clash exactly with
Android's system ICU library names, predictably leading to chaos. I
will have to come up with a non-clashing names for our ICU libraries
on Android.
(But isn't it stupid to include an own build of ICU if there is one in
the system already? Sure, but on the other hand the NDK doesn't
include ICU headers or libraries, so clearly Google doesn't consider
it part of the documented API. No guarantee of version stability
etc. Indeed best to avoid them then.)
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu4c-android.patch | 11 | ||||
| -rw-r--r-- | icu/makefile.mk | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/icu/icu4c-android.patch b/icu/icu4c-android.patch new file mode 100644 index 000000000000..f5b016e6e659 --- /dev/null +++ b/icu/icu4c-android.patch @@ -0,0 +1,11 @@ +--- misc/icu/source/config/mh-linux ++++ misc/build/icu/source/config/mh-linux +@@ -30,7 +30,7 @@ + + ## Compiler switch to embed a library name + # The initial tab in the next line is to prevent icu-config from reading it. +- LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) ++# LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) + #SH# # We can't depend on MIDDLE_SO_TARGET being set. + #SH# LD_SONAME= + diff --git a/icu/makefile.mk b/icu/makefile.mk index 4db60c0fc963..f0e9dfa5a770 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -54,6 +54,11 @@ PATCH_FILES=\ icu4c-escapespace.patch \ icu4c-strict-c.patch +.IF "$(OS)"=="ANDROID" +PATCH_FILES+=\ + icu4c-android.patch +.ENDIF + .IF "$(GUI)"=="UNX" .IF "$(SYSBASE)"!="" |