Kaydet (Commit) 190ddfcd authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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.)
üst 8731f255
--- 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=
......@@ -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)"!=""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment