summaryrefslogtreecommitdiff
path: root/cppunit
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@novell.com>2011-09-26 23:27:57 +0200
committerThorsten Behrens <tbehrens@novell.com>2011-09-27 09:46:38 +0200
commit04b8b4fbbb4b7f72f33d0b76b86945cb98c4ecd9 (patch)
treea9038a8c5081a246779a6d9b7fbfe0e774af725a /cppunit
parent47d7d1e987e1caa030c7623767d9dfe3d85eb924 (diff)
Make Android cross-build working
In the spirit of 12759f67a36d52a345be6002d7017551e8414c59, change external lib's config.sub to eat the arm-unknown-linux-androideabi host os string. Also, permit shared libs again - seems Android can handle those. Added dictionaries to cross-build-toolset - idxdict is needed. Should build up to sfx2 - some residual static lib issues there, and in raptor.
Diffstat (limited to 'cppunit')
-rw-r--r--cppunit/android.patch24
-rw-r--r--cppunit/makefile.mk2
2 files changed, 18 insertions, 8 deletions
diff --git a/cppunit/android.patch b/cppunit/android.patch
index 595f840ab712..e7a188c811aa 100644
--- a/cppunit/android.patch
+++ b/cppunit/android.patch
@@ -1,11 +1,21 @@
--- misc/cppunit-1.12.1/config/config.sub
+++ misc/build/cppunit-1.12.1/config/config.sub
-@@ -1246,7 +1246,7 @@
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+ | -udi* | -eabi* | -androideabi* | -lites* | -ieee* | -go32* | -aux* \
+@@ -120,7 +120,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+@@ -1250,7 +1250,7 @@
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ \ No newline at end of file
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 7fba665c5bd3..a136e343cd90 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -154,7 +154,7 @@ EXTRPATH = NONE
OUT2LIB = ooo-install/lib/libcppunit-1.12.a
.ELIF "$(OS)" == "OPENBSD"
OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1.0
-.ELIF "$(OS)" == "IOS" || "$(OS)" == "ANDROID"
+.ELIF "$(OS)" == "IOS"
OUT2LIB = ooo-install/lib/libcppunit.a
.ELSE
OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1