From 8a3ea757c35a000ea303a11b36692aebc2400ead Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
Date: Mon, 21 Nov 2011 14:25:37 +0200
Subject: Use --with-library-suffix=lo for Android to avoid clash with system
 ICU

---
 icu/makefile.mk | 16 ++++++++++------
 icu/prj/d.lst   |  6 ++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'icu')

diff --git a/icu/makefile.mk b/icu/makefile.mk
index f0e9dfa5a770..79889a2d78ac 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -136,8 +136,12 @@ STATIC_OR_SHARED=--disable-static --enable-shared
 BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(posix_PWD)/$(INPATH_FOR_BUILD)/misc/build/icu/source
 .ENDIF
 
+.IF "$(OS)"=="ANDROID"
+LIBRARY_SUFFIX= --with-library-suffix=lo
+.ENDIF
+
 CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \
-./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) '
+./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) $(LIBRARY_SUFFIX)'
 
 CONFIGURE_FLAGS=
 
@@ -159,11 +163,11 @@ OUT2LIB= \
     $(BUILD_DIR)$/lib$/libicutu.a
 .ELIF "$(OS)"=="ANDROID"
 OUT2LIB= \
-    $(BUILD_DIR)$/lib$/libicudata.so \
-    $(BUILD_DIR)$/lib$/libicuuc.so \
-    $(BUILD_DIR)$/lib$/libicui18n.so \
-    $(BUILD_DIR)$/lib$/libicule.so \
-    $(BUILD_DIR)$/lib$/libicutu.so
+    $(BUILD_DIR)$/lib$/libicudatalo.so \
+    $(BUILD_DIR)$/lib$/libicuuclo.so \
+    $(BUILD_DIR)$/lib$/libicui18nlo.so \
+    $(BUILD_DIR)$/lib$/libiculelo.so \
+    $(BUILD_DIR)$/lib$/libicutulo.so
 .ELSE
 OUT2LIB= \
     $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \
diff --git a/icu/prj/d.lst b/icu/prj/d.lst
index 3ae4de0a7e09..91000be94451 100644
--- a/icu/prj/d.lst
+++ b/icu/prj/d.lst
@@ -31,6 +31,12 @@ mkdir: %_DEST%\inc\external\unicode
 ..\%__SRC%\lib\libicuuc.so      %_DEST%\lib\
 ..\%__SRC%\lib\libicutu.so      %_DEST%\lib\
 
+..\%__SRC%\lib\libicudatalo.so    %_DEST%\lib\
+..\%__SRC%\lib\libicui18nlo.so    %_DEST%\lib\
+..\%__SRC%\lib\libiculelo.so      %_DEST%\lib\
+..\%__SRC%\lib\libicuuclo.so      %_DEST%\lib\
+..\%__SRC%\lib\libicutulo.so      %_DEST%\lib\
+
 ..\%__SRC%\lib\libicudata.a     %_DEST%\lib\
 ..\%__SRC%\lib\libicui18n.a     %_DEST%\lib\
 ..\%__SRC%\lib\libicule.a       %_DEST%\lib\
-- 
cgit