[Libreoffice-commits] .: 8 commits - berkeleydb/db-4.7.25.patch cppunit/makefile.mk Makefile.in README.cross sal/osl set_soenv.in solenv/gbuild solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Sun Nov 13 15:56:05 PST 2011
Makefile.in | 9 +--
README.cross | 16 ++---
berkeleydb/db-4.7.25.patch | 36 +++++++++++++
cppunit/makefile.mk | 4 +
sal/osl/android/src/org/libreoffice/android/Bootstrap.java | 2
set_soenv.in | 2
solenv/gbuild/platform/ANDROID_ARM_GCC.mk | 2
solenv/inc/unxandr.mk | 6 +-
8 files changed, 58 insertions(+), 19 deletions(-)
New commits:
commit 9bb31596b978b30e3823e576514bed31bb6c1d5f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Nov 14 01:49:41 2011 +0200
Link libcppunit with the shared GNU C++ library for Android
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index c4b7bba..551a0ea 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -121,6 +121,10 @@ OUT2LIB = ooo-install/lib/libcppunit.dll.a
MY_LIBS = -lm
.END
+.IF "$(OS)" == "ANDROID"
+MY_LIBS= -lgnustl_shared
+.ENDIF
+
CONFIGURE_ACTION = ./configure
.IF "$(COM)" == "GCC"
commit 47fd8a09a07cfb98201087de7e27717ad999be8b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Nov 14 01:48:01 2011 +0200
Also link shared libs always with -llog -landroid -lgnustl_shared
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index c22dbe9..52c92da 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -47,4 +47,6 @@ LINKFLAGSAPPCUI=-shared
STDLIBGUIMT+=-llog -landroid -lgnustl_shared
STDLIBCUIMT+=-llog -landroid -lgnustl_shared
+STDSHLGUIMT+=-llog -landroid -lgnustl_shared
+STDSHLCUIMT+=-llog -landroid -lgnustl_shared
commit 68bc001235dbee457bbe3b38ee9f42f9facaee2b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Nov 14 01:32:46 2011 +0200
Update Android example to use NDK r7
diff --git a/README.cross b/README.cross
index 0df25a8..6918ec6 100644
--- a/README.cross
+++ b/README.cross
@@ -325,14 +325,14 @@ 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
-CC=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm
-CXX=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
-AR=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
-NM=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
-OBJDUMP=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
-RANLIB=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ranlib
-STRIP=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-strip
+SYSBASE=/home/tml/android-ndk-r7/platforms/android-9/arch-arm
+CC=ccache /home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 --sysroot /home/tml/android-ndk-r7/platforms/android-9/arch-arm -L/home/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a
+CXX=ccache /home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 --sysroot /home/tml/android-ndk-r7/platforms/android-9/arch-arm -I /home/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
+AR=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
+NM=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
+OBJDUMP=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
+RANLIB=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ranlib
+STRIP=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-strip
CC_FOR_BUILD=ccache gcc
CXX_FOR_BUILD=ccache g++
--build=x86_64-unknown-linux-gnu
commit 342ff52958fe07531341d6fa97cc281830471b17
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Nov 14 01:29:46 2011 +0200
Link with -lgnustl_shared on Android
diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index 695f68d..7fc6a51 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -61,7 +61,7 @@ $(call gb_Helper_abbreviate_dirs,\
-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
$(LIBS) \
$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
- -llog -landroid \
+ -llog -landroid -lgnustl_shared \
-o $(1))
endef
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index 56ed49d..c22dbe9 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -45,6 +45,6 @@ CFLAGS+=-fno-omit-frame-pointer
LINKFLAGSAPPGUI=-shared
LINKFLAGSAPPCUI=-shared
-STDLIBGUIMT+=-llog -landroid
-STDLIBCUIMT+=-llog -landroid
+STDLIBGUIMT+=-llog -landroid -lgnustl_shared
+STDLIBCUIMT+=-llog -landroid -lgnustl_shared
commit 3cba8fb2c07a4a9bfcd3db5aab78a1bd51a48755
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Nov 14 01:22:11 2011 +0200
Search app's lib first
diff --git a/sal/osl/android/src/org/libreoffice/android/Bootstrap.java b/sal/osl/android/src/org/libreoffice/android/Bootstrap.java
index 8a1632f..45a9292 100644
--- a/sal/osl/android/src/org/libreoffice/android/Bootstrap.java
+++ b/sal/osl/android/src/org/libreoffice/android/Bootstrap.java
@@ -79,7 +79,7 @@ public class Bootstrap extends Activity
String fullName = null;
boolean found = false;
- String[] libraryLocations = { "/system/lib/", dataDir + "/lib/" };
+ String[] libraryLocations = { dataDir + "/lib/", "/system/lib/" };
for (String dir : libraryLocations ) {
fullName = dir + library;
if (new File(fullName).exists()) {
commit c0f18b2893f64ee0f33a00f20f016e58ae3d78e8
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Nov 14 00:43:43 2011 +0200
Add ARM Thumb mutex implementation from a "arm-thumb-mutex.patch"
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch
index 67a3da6..5c099c2 100644
--- a/berkeleydb/db-4.7.25.patch
+++ b/berkeleydb/db-4.7.25.patch
@@ -1066,3 +1066,39 @@
+
+.INCLUDE : target.mk
+
+--- misc/db-4.7.25.NC/dbinc/mutex_int.h
++++ misc/build/db-4.7.25.NC/dbinc/mutex_int.h
+@@ -402,6 +402,25 @@
+
+ #ifdef LOAD_ACTUAL_MUTEX_CODE
+ /* gcc/arm: 0 is clear, 1 is set. */
++#if defined __thumb__
++#define MUTEX_SET(tsl) ({ \
++ int __r, __p; \
++ __asm__ volatile( \
++ ".align 2\n\t" \
++ "bx pc\n\t" \
++ "nop\n\t" \
++ ".arm\n\t" \
++ "swpb %0, %2, [%3]\n\t" \
++ "eor %0, %0, #1\n\t" \
++ "orr %1, pc, #1\n\t" \
++ "bx %1\n\t" \
++ ".force_thumb" \
++ : "=&r" (__r), "=r" (__p) \
++ : "r" (1), "r" (tsl) \
++ ); \
++ __r & 1; \
++})
++#else
+ #define MUTEX_SET(tsl) ({ \
+ int __r; \
+ asm volatile( \
+@@ -484,6 +503,7 @@
+ ); \
+ __r & 1; \
+ })
++#endif
+
+ #define MUTEX_UNSET(tsl) (*(volatile tsl_t *)(tsl) = 0)
+ #define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)
commit 47b383087d5e391caecf46bf621db48772f174da
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Nov 14 00:27:42 2011 +0200
Avoid silly -Lno_x_libraries (for Android, which is Linux, but without X11)
diff --git a/set_soenv.in b/set_soenv.in
index 35ab64e..f0cee21 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1220,7 +1220,7 @@ elsif ($platform =~ m/linux|netbsd|aix|freebsd|openbsd|dragonfly/)
if ($platform =~ m/openbsd/) {
$SOLARLIB .= $L.$USR_LOCAL.$LIB;
}
- if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" ) {
+ if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" && $XLIB ne "no_x_libraries" ) {
$SOLARLIB .= $L.$XLIB;
}
$JAVALIB = $L.'$JAVA_HOME'.$LIB64.
commit 79ffe3c27c7130b279478ae137932608a68b3c3c
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Sun Nov 13 22:52:16 2011 +0200
Make the clean-host target really do just that
diff --git a/Makefile.in b/Makefile.in
index f339c6c..24a73b7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,20 +95,17 @@ clean: clean-host clean-build
clean-host:
. ./Env.Host.sh && \
rm -rf */$$INPATH && \
- rm -rf solver/$$INPATH && \
- rm -rf workdir && \
rm -rf install
+
+clean-build:
ifeq (@BUILD_DMAKE@,YES)
. ./Env.Host.sh && \
(if [ -f dmake/Makefile ] ; then $$GNUMAKE -C dmake clean; fi) && \
rm -f solenv/*/bin/dmake*
endif
-
-clean-build:
ifeq (@CROSS_COMPILING@,YES)
. ./Env.Host.sh && \
- rm -rf */$$INPATH_FOR_BUILD && \
- rm -rf solver/$$INPATH_FOR_BUILD
+ rm -rf */$$INPATH_FOR_BUILD
endif
dmake/dmake at EXEEXT_FOR_BUILD@:
More information about the Libreoffice-commits
mailing list