[Libreoffice-commits] .: 2 commits - icu/makefile.mk icu/prj RepositoryExternal.mk sal/osl solenv/inc

[Tor Lillqvist]

 RepositoryExternal.mk    |   26 ++++++++++++++++----------
 icu/makefile.mk          |   17 +++++++++++------
 icu/prj/d.lst            |    6 ++++++
 sal/osl/android/Makefile |    6 +++---
 solenv/inc/libs.mk       |    9 +++++++--
 5 files changed, 43 insertions(+), 21 deletions(-)

New commits:
commit 27f585b6b5391e45106e76a35990b588570d8acd
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Nov 21 15:46:42 2011 +0200

    Link with -lgnustl_shared for Android

diff --git a/icu/makefile.mk b/icu/makefile.mk
index 79889a2..20fcb10 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -138,6 +138,7 @@ BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-bu
 
 .IF "$(OS)"=="ANDROID"
 LIBRARY_SUFFIX= --with-library-suffix=lo
+icu_LDFLAGS+=-lgnustl_shared
 .ENDIF
 
 CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \
commit 8a3ea757c35a000ea303a11b36692aebc2400ead
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Nov 21 14:25:37 2011 +0200

    Use --with-library-suffix=lo for Android to avoid clash with system ICU

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d7ff86f..11deeaa 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -384,6 +384,12 @@ endef
 
 else # !SYSTEM_ICU
 
+ifeq ($(OS),ANDROID)
+gb_ICU_suffix:=lo
+else
+gb_ICU_suffix:=
+endif
+
 # icudata and icui18n is called icudt and icuin when built with MSVC :-(
 ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
@@ -408,22 +414,22 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\
 endef
 else
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	icudata \
-	icui18n \
-	icule \
-	icutu \
-	icuuc \
+	icudata$(gb_ICU_suffix) \
+	icui18n$(gb_ICU_suffix) \
+	icule$(gb_ICU_suffix) \
+	icutu$(gb_ICU_suffix) \
+	icuuc$(gb_ICU_suffix) \
 ))
 
 define gb_LinkTarget__use_icudata
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-	icudata \
+	icudata$(gb_ICU_suffix) \
 )
 
 endef
 define gb_LinkTarget__use_icui18n
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-	icui18n \
+	icui18n$(gb_ICU_suffix) \
 )
 
 endef
@@ -431,19 +437,19 @@ endif
 
 define gb_LinkTarget__use_icule
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-	icule \
+	icule$(gb_ICU_suffix) \
 )
 
 endef
 define gb_LinkTarget__use_icutu
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-	icutu \
+	icutu$(gb_ICU_suffix) \
 )
 
 endef
 define gb_LinkTarget__use_icuuc
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-	icuuc \
+	icuuc$(gb_ICU_suffix) \
 )
 
 endef
diff --git a/icu/makefile.mk b/icu/makefile.mk
index f0e9dfa..79889a2 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 3ae4de0..91000be 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\
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile
index f772b84..dd392f5 100644
--- a/sal/osl/android/Makefile
+++ b/sal/osl/android/Makefile
@@ -62,9 +62,9 @@ ndk-build:
 		  gcc3_uno \
 		  i18nisolang1gcc3 \
 		  i18nutilgcc3 \
-		  icudata \
-		  icui18n \
-		  icuuc \
+		  icudatalo \
+		  icui18nlo \
+		  icuuclo \
 		  reg \
 		  store \
 		  ucbhelper4gcc3 \
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 17d4825..12db54a 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -48,12 +48,17 @@ ICUINLIB=-licuin$(ICU_MAJOR)$(ICU_MINOR)
 ICULELIB=-licule$(ICU_MAJOR)$(ICU_MINOR)
 ICUUCLIB=-licuuc$(ICU_MAJOR)$(ICU_MINOR)
 ICUDATALIB=-licudt$(ICU_MAJOR)$(ICU_MINOR)
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
+.ELIF "$(OS)"=="ANDROID"
+ICUINLIB=-licui18nlo
+ICULELIB=-liculelo
+ICUUCLIB=-licuuclo
+ICUDATALIB=-licudatalo
+.ELSE
 ICUINLIB=-licui18n
 ICULELIB=-licule
 ICUUCLIB=-licuuc
 ICUDATALIB=-licudata
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
+.ENDIF
 I18NUTILLIB=-li18nutil$(COMID)
 I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
 I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)