[Libreoffice-commits] .: 7 commits - cppunit/android.patch cppunit/makefile.mk cppunit/prj curl/curl-android.patch curl/makefile.mk libxml2/libxml2-android.patch libxml2/makefile.mk libxml2/prj libxslt/libxslt-android.patch libxslt/makefile.mk libxslt/prj README.cross sal/prj solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Nov 9 15:24:19 PST 2011
README.cross | 14 +++++++-------
cppunit/android.patch | 1 -
cppunit/makefile.mk | 8 +++++++-
cppunit/prj/d.lst | 3 +++
curl/curl-android.patch | 15 +++++++++++++++
curl/makefile.mk | 5 +++++
libxml2/libxml2-android.patch | 15 +++++++++++++++
libxml2/makefile.mk | 4 ++++
libxml2/prj/d.lst | 1 +
libxslt/libxslt-android.patch | 15 +++++++++++++++
libxslt/makefile.mk | 4 ++++
libxslt/prj/d.lst | 2 ++
sal/prj/d.lst | 1 +
solenv/inc/_tg_shl.mk | 40 ++++++++++++++++++++--------------------
solenv/inc/tg_shl.mk | 4 ++--
solenv/inc/unx.mk | 2 +-
16 files changed, 102 insertions(+), 32 deletions(-)
New commits:
commit 12fea3754acabadb5f6e267497cbc9ab9e3da274
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 10 01:22:03 2011 +0200
Make also the libxslt library file names end in .so for Android
diff --git a/libxslt/libxslt-android.patch b/libxslt/libxslt-android.patch
new file mode 100644
index 0000000..68069d6
--- /dev/null
+++ b/libxslt/libxslt-android.patch
@@ -0,0 +1,15 @@
+--- misc/libxslt-1.1.26/ltmain.sh
++++ misc/build/libxslt-1.1.26/ltmain.sh
+@@ -3228,6 +3228,12 @@
+ func_warning "\`-release' is ignored for convenience libraries"
+ else
+
++ # Force no versioning suffix for Android thanks to silly
++ # apkbuilder which doesn't add extra native libs unless their
++ # name ends with .so
++
++ version_type=none
++
+ # Parse the version information argument.
+ save_ifs="$IFS"; IFS=':'
+ set dummy $vinfo 0 0 0
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index f884c35..2bec8bd 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -59,6 +59,10 @@ PATCH_FILES=libxslt-configure.patch \
libxslt-aix.patch \
libxslt-vc10.patch
+.IF "$(OS)"=="ANDROID"
+PATCH_FILES+= libxslt-android.patch
+.ENDIF
+
# This is only for UNX environment now
.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst
index 74f759e..0627cc1 100644
--- a/libxslt/prj/d.lst
+++ b/libxslt/prj/d.lst
@@ -2,8 +2,10 @@ mkdir: %_DEST%\inc\external\libxslt
..\%__SRC%\inc\*.h %_DEST%\inc\external\libxslt\*.h
..\%__SRC%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so.1
symlink: %_DEST%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so
+..\%__SRC%\lib\libxslt.so %_DEST%\lib\libxslt.so
..\%__SRC%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so.0
symlink: %_DEST%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so
+..\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so
..\%__SRC%\lib\libxslt*.* %_DEST%\lib\libxslt*.*
..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\*.a
..\%__SRC%\bin\lib*.dll %_DEST%\bin
commit 90324ccc737805cd5adc3da0e1b078847cfa998d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 10 01:17:25 2011 +0200
Make also the libxml2 library file name end in .so for Android
diff --git a/libxml2/libxml2-android.patch b/libxml2/libxml2-android.patch
new file mode 100644
index 0000000..cbc9ff4
--- /dev/null
+++ b/libxml2/libxml2-android.patch
@@ -0,0 +1,15 @@
+--- misc/libxml2-2.7.6/ltmain.sh
++++ misc/build/libxml2-2.7.6/ltmain.sh
+@@ -3228,6 +3228,12 @@
+ func_warning "\`-release' is ignored for convenience libraries"
+ else
+
++ # Force no versioning suffix for Android thanks to silly
++ # apkbuilder which doesn't add extra native libs unless their
++ # name ends with .so
++
++ version_type=none
++
+ # Parse the version information argument.
+ save_ifs="$IFS"; IFS=':'
+ set dummy $vinfo 0 0 0
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 098d30b..1d125c1 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -63,6 +63,10 @@ PATCH_FILES+= libxml2-mingw.patch
.ENDIF
.ENDIF
+.IF "$(OS)"=="ANDROID"
+PATCH_FILES+= libxml2-android.patch
+.ENDIF
+
# This is only for UNX environment now
.IF "$(OS)"=="WNT"
diff --git a/libxml2/prj/d.lst b/libxml2/prj/d.lst
index e28c52e..6e7bbb4 100644
--- a/libxml2/prj/d.lst
+++ b/libxml2/prj/d.lst
@@ -2,6 +2,7 @@ mkdir: %_DEST%\inc\external\libxml
..\%__SRC%\inc\libxml\*.h %_DEST%\inc\external\libxml\*.h
..\%__SRC%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so.2
symlink: %_DEST%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so
+..\%__SRC%\lib\libxml2.so %_DEST%\lib\libxml2.so
..\%__SRC%\lib\*.lib %_DEST%\lib
..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.dll.a
..\%__SRC%\lib\libxml2.a %_DEST%\lib\libxml2.a
commit f522222415847cd253af7e8b768ea945daeed8b6
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 10 01:10:19 2011 +0200
Make also the libcurl library end in .so for Android
diff --git a/curl/curl-android.patch b/curl/curl-android.patch
new file mode 100644
index 0000000..130c88d
--- /dev/null
+++ b/curl/curl-android.patch
@@ -0,0 +1,15 @@
+--- misc/curl-7.19.7/ltmain.sh
++++ misc/build/curl-7.19.7/ltmain.sh
+@@ -3228,6 +3228,12 @@
+ func_warning "\`-release' is ignored for convenience libraries"
+ else
+
++ # Force no versioning suffix for Android thanks to silly
++ # apkbuilder which doesn't add extra native libs unless their
++ # name ends with .so
++
++ version_type=none
++
+ # Parse the version information argument.
+ save_ifs="$IFS"; IFS=':'
+ set dummy $vinfo 0 0 0
diff --git a/curl/makefile.mk b/curl/makefile.mk
index 66b8d9b..c7fca54 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -54,6 +54,9 @@ PATCH_FILES=\
.ENDIF
.ENDIF
+.IF "$(OS)" == "ANDROID"
+ PATCH_FILES+=curl-android.patch
+.ENDIF
#CONVERTFILES= \
lib$/Makefile.vc6
@@ -96,6 +99,8 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
.IF "$(OS)"=="IOS"
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a
+.ELIF "$(OS)"=="ANDROID"
+OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.so
.ELSE
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).?
.ENDIF
commit ccdd1b9a2533ce5a0d5a0661e807e2a31ac825ec
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 10 00:36:50 2011 +0200
Deliver the Android libuno_sal.so
diff --git a/sal/prj/d.lst b/sal/prj/d.lst
index f7ac525..5023c57 100644
--- a/sal/prj/d.lst
+++ b/sal/prj/d.lst
@@ -20,6 +20,7 @@ mkdir: %_DEST%\inc\systools\win32
..\%__SRC%\lib\libuno_sal.so.3 %_DEST%\lib\libuno_sal.so.3
symlink: %_DEST%\lib\libuno_sal.so.3 %_DEST%\lib\libuno_sal.so
+..\%__SRC%\lib\libuno_sal.so %_DEST%\lib\libuno_sal.so
..\%__SRC%\lib\libuno_sal.dylib.3 %_DEST%\lib\libuno_sal.dylib.3
symlink: %_DEST%\lib\libuno_sal.dylib.3 %_DEST%\lib\libuno_sal.dylib
..\%__SRC%\lib\libsal_textenc.so %_DEST%\lib\libsal_textenc.so
commit 70e5662204c49136f55f347694c2c3f171765407
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 10 00:32:47 2011 +0200
We want Android shared objects to have names ending in .so
See my previous commit for rationale.
For Android, bypass the UNIXVERSIONNAMES thing in the dmake build
system.
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index a60f9ce..f7aa241 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -190,7 +190,7 @@ $(USE_SHL1VERSIONMAP) .ERRREMOVE: $(SHL1VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -491,7 +491,7 @@ $(SHL1TARGETN) : \
.ENDIF # "$(SHL1NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL1TARGETN:b)
$(COMMAND_ECHO)cd $(LB) && ln -s $(SHL1TARGETN:f) $(SHL1TARGETN:b)
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -694,7 +694,7 @@ $(USE_SHL2VERSIONMAP) .ERRREMOVE: $(SHL2VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -995,7 +995,7 @@ $(SHL2TARGETN) : \
.ENDIF # "$(SHL2NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL2TARGETN:b)
$(COMMAND_ECHO)cd $(LB) && ln -s $(SHL2TARGETN:f) $(SHL2TARGETN:b)
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -1198,7 +1198,7 @@ $(USE_SHL3VERSIONMAP) .ERRREMOVE: $(SHL3VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -1499,7 +1499,7 @@ $(SHL3TARGETN) : \
.ENDIF # "$(SHL3NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL3TARGETN:b)
$(COMMAND_ECHO)cd $(LB) && ln -s $(SHL3TARGETN:f) $(SHL3TARGETN:b)
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -1702,7 +1702,7 @@ $(USE_SHL4VERSIONMAP) .ERRREMOVE: $(SHL4VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -2003,7 +2003,7 @@ $(SHL4TARGETN) : \
.ENDIF # "$(SHL4NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL4TARGETN:b)
$(COMMAND_ECHO)cd $(LB) && ln -s $(SHL4TARGETN:f) $(SHL4TARGETN:b)
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -2206,7 +2206,7 @@ $(USE_SHL5VERSIONMAP) .ERRREMOVE: $(SHL5VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -2507,7 +2507,7 @@ $(SHL5TARGETN) : \
.ENDIF # "$(SHL5NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL5TARGETN:b)
$(COMMAND_ECHO)cd $(LB) && ln -s $(SHL5TARGETN:f) $(SHL5TARGETN:b)
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -2710,7 +2710,7 @@ $(USE_SHL6VERSIONMAP) .ERRREMOVE: $(SHL6VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -3011,7 +3011,7 @@ $(SHL6TARGETN) : \
.ENDIF # "$(SHL6NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL6TARGETN:b)
$(COMMAND_ECHO)cd $(LB) && ln -s $(SHL6TARGETN:f) $(SHL6TARGETN:b)
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -3214,7 +3214,7 @@ $(USE_SHL7VERSIONMAP) .ERRREMOVE: $(SHL7VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -3515,7 +3515,7 @@ $(SHL7TARGETN) : \
.ENDIF # "$(SHL7NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL7TARGETN:b)
$(COMMAND_ECHO)cd $(LB) && ln -s $(SHL7TARGETN:f) $(SHL7TARGETN:b)
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -3718,7 +3718,7 @@ $(USE_SHL8VERSIONMAP) .ERRREMOVE: $(SHL8VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -4019,7 +4019,7 @@ $(SHL8TARGETN) : \
.ENDIF # "$(SHL8NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL8TARGETN:b)
$(COMMAND_ECHO)cd $(LB) && ln -s $(SHL8TARGETN:f) $(SHL8TARGETN:b)
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -4222,7 +4222,7 @@ $(USE_SHL9VERSIONMAP) .ERRREMOVE: $(SHL9VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -4523,7 +4523,7 @@ $(SHL9TARGETN) : \
.ENDIF # "$(SHL9NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL9TARGETN:b)
$(COMMAND_ECHO)cd $(LB) && ln -s $(SHL9TARGETN:f) $(SHL9TARGETN:b)
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -4726,7 +4726,7 @@ $(USE_SHL10VERSIONMAP) .ERRREMOVE: $(SHL10VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -5027,7 +5027,7 @@ $(SHL10TARGETN) : \
.ENDIF # "$(SHL10NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL10TARGETN:b)
$(COMMAND_ECHO)cd $(LB) && ln -s $(SHL10TARGETN:f) $(SHL10TARGETN:b)
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index d6bcbc8..4547741 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -219,7 +219,7 @@ $(USE_SHL$(TNR)VERSIONMAP) .ERRREMOVE: $(SHL$(TNR)VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="AIX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -520,7 +520,7 @@ $(SHL$(TNR)TARGETN) : \
.ENDIF # "$(SHL$(TNR)NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
-.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS"
+.IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
$(COMMAND_ECHO)$(RM) $(LB)/$(SHL$(TNR)TARGETN:b)
$(COMMAND_ECHO)cd $(LB) && ln -s $(SHL$(TNR)TARGETN:f) $(SHL$(TNR)TARGETN:b)
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 2dfbaf7..3093d58 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -162,7 +162,7 @@ SOLARSHAREDBIN=$(SOLARLIBDIR_FOR_BUILD)
SONAME_SWITCH*=-h
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="IOS"
+.IF "$(OS)"!="IOS" && "$(OS)"!="ANDROID"
DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR)
.ENDIF
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
commit aafe4bd7f63ff59b9cde725701ccd0d8868a68bc
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Nov 10 00:19:09 2011 +0200
We want Android shared objects to have names ending in .so
The silly apkbuilder tool doesn't add extra native libs to an .apk
package unless their name ends with .so. It just silently ignores
them. So, force libtool to avoid versioning suffix for Android.
Yeah, unclear whether apkbuilder is what we will end up using to
construct the APKs of actual LO code using Android apps. But at this
stage when just trying to build a unit testing app, it seems to be the
simplest way to get the .apk properly signed and all to just use a
normal Ant project, and let Ant run apkbuilder.
diff --git a/cppunit/android.patch b/cppunit/android.patch
index e7a188c..7d88a82 100644
--- a/cppunit/android.patch
+++ b/cppunit/android.patch
@@ -18,4 +18,18 @@
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-
\ No newline at end of file
+--- misc/cppunit-1.12.1/config/ltmain.sh
++++ misc/build/cppunit-1.12.1/config/ltmain.sh
+@@ -3228,6 +3228,12 @@
+ fi
+ else
+
++ # Force no versioning suffix for Android thanks to silly
++ # apkbuilder which doesn't add extra native libs unless their
++ # name ends with .so
++
++ version_type=none
++
+ # Parse the version information argument.
+ save_ifs="$IFS"; IFS=':'
+ set dummy $vinfo 0 0 0
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index fe7f3f0..c4b7bba 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -34,12 +34,16 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19
# from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
# cppunit-1.12.1.tar.gz/download>
-PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch android.patch ios.patch
+PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch
# solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
# aid=2912590&group_id=11795&atid=311795>
# warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
# aid=2912630&group_id=11795&atid=311795>
+.IF "$(OS)" == "ANDROID"
+PATCH_FILES += android.patch
+.ENDIF
+
.IF "$(OS)" == "WNT"
.IF "$(COM)" == "MSC"
@@ -165,6 +169,8 @@ OUT2LIB = ooo-install/lib/libcppunit-1.12.a
OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1.0
.ELIF "$(OS)" == "IOS"
OUT2LIB = ooo-install/lib/libcppunit.a
+.ELIF "$(OS)" == "ANDROID"
+OUT2LIB = ooo-install/lib/libcppunit-1.12.so
.ELSE
OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1
.END
diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
index 97e710d..7235dfa 100644
--- a/cppunit/prj/d.lst
+++ b/cppunit/prj/d.lst
@@ -22,6 +22,9 @@ mkdir: %_DEST%\inc\cppunit\ui\text
..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib\libcppunit-1.12.1.dylib
symlink: %_DEST%\lib\libcppunit-1.12.1.dylib %_DEST%\lib\libcppunit.dylib
+..\%__SRC%\lib\libcppunit-1.12.so %_DEST%\lib\libcppunit-1.12.so
+symlink: %_DEST%\lib\libcppunit-1.12.so %_DEST%\lib\libcppunit.so
+
..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib\libcppunit-1.12.so.1
symlink: %_DEST%\lib\libcppunit-1.12.so.1 %_DEST%\lib\libcppunit.so
commit b737dad012e743671654dfa6d1a6bc6cd90add15
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Nov 8 15:38:18 2011 +0200
Tiny edit
diff --git a/README.cross b/README.cross
index cd15bca..9af4de7 100644
--- a/README.cross
+++ b/README.cross
@@ -266,16 +266,16 @@ highly experimental and just in its baby steps phase.
Technically, one important special aspect of iOS is that apps are not
allowed to load own dynamic libraries. (System libraries are used in
-the form of dynamic libraries, just like on MacOSX, of which iOS is a
+the form of dynamic libraries, just like on Mac OS X, of which iOS is a
variant.) So all the libraries in LibreOffice that normally are shared
libraries (DLLs on Windows, shared objects (.so) on Linux, dynamic
-libraries on MacOSX (.dylib)) need to be built as static archives
+libraries on Mac OS X (.dylib)) need to be built as static archives
instead. Obviously this will have some interesting consequences for
how UNO is implemented and used. None of that has been spared much
thought yet.
The Apple tool-chain for iOS cross-building is available only for
-MacOSX, so that is where I have been doing it.
+Mac OS X, so that is where I have been doing it.
Here is my autogen.lastrun for iOS (device):
CXX=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
@@ -311,10 +311,10 @@ approach as used on iOS will need to be used.
As for the GUI, the same holds as said above for iOS.
I have done my Android cross-compilation work on Linux (openSUSE in
-particular), but it could as well be done on MacOSX. The Android
-cross-buld tool-chain (the "Native Development Kit", or NDK) is
-available for Linux, MacOSX and Windows. (Trying to cross-compile from
-Windows will probably drive you insane.)
+particular) and Mac OS X. The Android cross-buld tool-chain (the
+"Native Development Kit", or NDK) is available for Linux, Mac OS X and
+Windows. (Trying to cross-compile from Windows will probably drive you
+insane.)
Here is my autogen.lastrun for Android:
SYSBASE=/home/tml/android-ndk-r6b/platforms/android-9/arch-arm
More information about the Libreoffice-commits
mailing list