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.
author: Thorsten Behrens <tbehrens@novell.com> 2011-09-26 23:27:57 +0200
committer: Thorsten Behrens <tbehrens@novell.com> 2011-09-27 09:46:38 +0200
commit: 04b8b4fbbb4b7f72f33d0b76b86945cb98c4ecd9 (patch)
tree: a9038a8c5081a246779a6d9b7fbfe0e774af725a
parent: 47d7d1e987e1caa030c7623767d9dfe3d85eb924 (diff)
22 files changed, 216 insertions, 107 deletions
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch
index 6077e6669c77..67a3da6d1dfb 100644
--- a/berkeleydb/db-4.7.25.patch
+++ b/berkeleydb/db-4.7.25.patch
@@ -400,15 +400,24 @@
 
 --- misc/db-4.7.25.NC/dist/config.sub
 +++ misc/build/db-4.7.25.NC/dist/config.sub
-@@ -1272,7 +1272,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* | -androideabi* | -eabi* | -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
+@@ -1247,7 +1247,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* \
 --- misc/db-4.7.25.NC/dist/configure	2008-05-15 23:12:41.000000000 +0200
 +++ misc/build/db-4.7.25.NC/dist/configure	2009-07-21 11:39:25.000000000 +0200
 @@ -3757,8 +3757,10 @@
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index 0c4d8255cca1..93234f0dde9a 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -116,7 +116,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_DIR_OUT=$(CONFIGURE_DIR)
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 
-.IF "$(OS)"=="IOS" || "$(OS)" == "ANDROID"
+.IF "$(OS)"=="IOS"
 OUT2LIB=$(BUILD_DIR)$/libdb*.a
 .ELSE
 OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk
index 3dfc40411454..31791984a7c3 100644
--- a/canvas/Module_canvas.mk
+++ b/canvas/Module_canvas.mk
@@ -29,7 +29,6 @@
 $(eval $(call gb_Module_Module,canvas))
 
 $(eval $(call gb_Module_add_targets,canvas,\
-	Library_cairocanvas \
 	Library_canvasfactory \
 	Library_canvastools \
 	Library_nullcanvas \
@@ -38,6 +37,12 @@ $(eval $(call gb_Module_add_targets,canvas,\
 	Package_inc \
 ))
 
+ifeq ($(ENABLE_CAIRO_CANVAS),TRUE)
+$(eval $(call gb_Module_add_targets,canvas,\
+	Library_cairocanvas \
+))
+endif
+
 ifeq ($(strip $(OS)),WNT)
 ifneq ($(strip $(ENABLE_DIRECTX)),)
 
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
diff --git a/cross_toolset/prj/build.lst b/cross_toolset/prj/build.lst
index e05ad81e5192..432bbbeac1d4 100644
--- a/cross_toolset/prj/build.lst
+++ b/cross_toolset/prj/build.lst
@@ -1 +1 @@
-crs	cross_toolset	::	autodoc oovbaapi unodevtools gettext idl rsc setup_native icc xmlhelp shell	NULL
+crs	cross_toolset	::	autodoc oovbaapi unodevtools gettext idl rsc setup_native icc xmlhelp shell DICTIONARIES:dictionaries NULL
diff --git a/curl/curl-7.19.7.patch b/curl/curl-7.19.7.patch
index ca25c230762b..37e8c9a830d0 100644
--- a/curl/curl-7.19.7.patch
+++ b/curl/curl-7.19.7.patch
@@ -1,14 +1,23 @@
---- misc/curl-7.19.7/config.sub
-+++ misc/build/curl-7.19.7/config.sub
-@@ -1272,7 +1272,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* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+--- misc/curl-7.19.7/config.sub	2009-11-04 13:26:13.000000000 +0100
++++ misc/build/curl-7.19.7/config.sub	2011-09-26 17:29:12.000000000 +0200
+@@ -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* | \
+   kopensolaris*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+@@ -1282,7 +1282,7 @@
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  	      | -chorusos* | -chorusrdb* | -cegcc* \
  	      | -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* \
 --- misc/curl-7.19.7/configure	2009-11-04 13:26:02.000000000 +0100
 +++ misc/build/curl-7.19.7/configure	2009-11-18 14:17:25.453125000 +0100
 @@ -2735,8 +2735,8 @@
diff --git a/curl/makefile.mk b/curl/makefile.mk
index c2a92e71fe08..862ff2c555ca 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -94,10 +94,10 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 
-.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
+.IF "$(OS)"=="IOS"
 OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a
 .ELSE
-OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4
+OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).?
 .ENDIF
 .ENDIF			# "$(GUI)"=="UNX"
 
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index e8d9da46f468..607564646928 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -11,6 +11,8 @@
 --disable-randr
 --disable-randr-link
 --disable-systray
+--disable-ext-pdfimport
+--disable-cairo-canvas
 --enable-python=internal
 --without-fonts
 --without-java
diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch
index f168297ac03e..95b573a3d007 100644
--- a/expat/expat-2.0.1.patch
+++ b/expat/expat-2.0.1.patch
@@ -1,14 +1,23 @@
---- misc/expat-2.0.1/conftools/config.sub
-+++ misc/build/expat-2.0.1/conftools/config.sub
-@@ -1272,7 +1272,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* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+--- misc/expat-2.0.1/conftools/config.sub	2006-09-22 16:42:54.000000000 +0200
++++ misc/build/expat-2.0.1/conftools/config.sub	2011-09-26 22:45:56.000000000 +0200
+@@ -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
+@@ -1211,7 +1211,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* \
 --- misc/expat-2.0.1/lib/makefile.mk	Wed Aug 20 14:33:55 2008
 +++ misc/build/expat-2.0.1/lib/makefile.mk	Wed Aug 20 14:26:42 2008
 @@ -1 +1,90 @@
diff --git a/hunspell/hunspell-android.patch b/hunspell/hunspell-android.patch
index 7daef8c3ed79..1bfbb4beb0f9 100644
--- a/hunspell/hunspell-android.patch
+++ b/hunspell/hunspell-android.patch
@@ -1,14 +1,23 @@
---- misc/hunspell-1.3.2/config.sub
-+++ misc/build/hunspell-1.3.2/config.sub
-@@ -1272,7 +1272,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* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+--- misc/hunspell-1.3.2/config.sub	2010-02-23 10:08:48.000000000 +0100
++++ misc/build/hunspell-1.3.2/config.sub	2011-09-26 23:31:02.000000000 +0200
+@@ -118,7 +118,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-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+   kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+@@ -1161,7 +1161,7 @@
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  	      | -chorusos* | -chorusrdb* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 --- misc/hunspell-1.3.2/src/tools/munch.c
 +++ misc/build/hunspell-1.3.2/src/tools/munch.c
 @@ -8,7 +8,7 @@
diff --git a/hyphen/hyphen-2.7.1.patch b/hyphen/hyphen-2.7.1.patch
index f4449550f301..50b7d5ad3244 100644
--- a/hyphen/hyphen-2.7.1.patch
+++ b/hyphen/hyphen-2.7.1.patch
@@ -1,14 +1,23 @@
 --- misc/hyphen-2.7.1/config.sub
 +++ misc/build/hyphen-2.7.1/config.sub
-@@ -1272,7 +1272,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* | -androideabi* | -eabi* | -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
+@@ -1215,7 +1215,7 @@
+ 	      | -udi* | -androideabi* | -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* \
 --- misc/hyphen-2.7.1/Makefile.am	2010-07-19 11:23:17.000000000 +0200
 +++ misc/build/hyphen-2.7.1/Makefile.am	2010-12-02 10:15:44.390625000 +0100
 @@ -25,14 +25,13 @@
diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch
index 3a09610682ee..a9b0b41ba505 100644
--- a/icu/icu4c-build.patch
+++ b/icu/icu4c-build.patch
@@ -1,14 +1,23 @@
---- misc/icu/source/config.sub
-+++ misc/build/icu/source/config.sub
-@@ -1272,7 +1272,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* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+--- misc/icu/source/config.sub	2010-09-29 20:38:38.000000000 +0200
++++ misc/build/icu/source/config.sub	2011-09-26 22:51:02.000000000 +0200
+@@ -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* \
 --- misc/icu/source/configure
 +++ misc/build/icu/source/configure
 @@ -5438,7 +5438,7 @@
@@ -16,7 +25,7 @@
  		icu_cv_host_frag=mh-linux-va
  	fi ;;
 -*-*-linux*|*-pc-gnu) icu_cv_host_frag=mh-linux ;;
-+*-*-linux*|*-pc-gnu|*-*-androideabi*) icu_cv_host_frag=mh-linux ;;
++*-*-linux*|*-pc-gnu|*-*-*-androideabi*) icu_cv_host_frag=mh-linux ;;
  *-*-cygwin|*-*-mingw32)
  	if test "$GCC" = yes; then
  		cat >conftest.$ac_ext <<_ACEOF
@@ -24,7 +33,7 @@
  # Check to see if genccode can generate simple assembly.
  GENCCODE_ASSEMBLY=
  case "${host}" in
-+*-linux-androideabi)
++*-*-linux-androideabi)
 +    GENCCODE_ASSEMBLY="-a gcc-android"
 +    ;;
  *-linux*|i*86-*-*bsd*|i*86-pc-gnu)
@@ -34,7 +43,7 @@
      # wchar_t can be used
      CHECK_UTF16_STRING_RESULT="available"
      ;;
-+*-*-androideabi*)
++*-*-*-androideabi*)
 +    # no UTF-16 strings thanks, I think, this is to avoid the -std=c++0x which causes trouble with uint64_t
 +    CHECK_UTF16_STRING_RESULT="nope"
 +    ;;
diff --git a/libtextcat/libexttextcat-3.0.1.patch b/libtextcat/libexttextcat-3.0.1.patch
new file mode 100644
index 000000000000..3128560dbd24
--- /dev/null
+++ b/libtextcat/libexttextcat-3.0.1.patch
@@ -0,0 +1,19 @@
+--- misc/libexttextcat-3.0.1/config.sub	2011-09-20 17:14:22.000000000 +0200
++++ misc/build/libexttextcat-3.0.1/config.sub	2011-09-26 16:05:16.000000000 +0200
+@@ -320,7 +320,7 @@
+ 	  basic_machine=$basic_machine-pc
+ 	  ;;
+ 	# Object if more than one company name word.
+-	*-*-*)
++	*-*-*-*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1
+ 		;;
+@@ -1292,6 +1292,7 @@
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -androideabi \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index c245c60f47f7..d7f7f1bc08b4 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -46,6 +46,9 @@ TARFILE_NAME=libexttextcat-3.0.1
 TARFILE_MD5=131b91de2d1df0ff5f0a8284b5417f8b
 TARFILE_ROOTDIR=libexttextcat-3.0.1
 
+PATCH_FILES=\
+    libexttextcat-3.0.1.patch
+
 .IF "$(GUI)"=="UNX"
 #relative to CONFIGURE_DIR
 CONFIGURE_ACTION=configure --disable-shared --with-pic CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch
index 8694b6a4d328..d13d55e83ce7 100644
--- a/libxml2/libxml2-configure.patch
+++ b/libxml2/libxml2-configure.patch
@@ -1,14 +1,23 @@
---- misc/libxml2-2.7.6/config.sub
-+++ misc/build/libxml2-2.7.6/config.sub
-@@ -1272,7 +1272,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* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+--- misc/libxml2-2.7.6/config.sub	2009-06-11 11:29:50.000000000 +0200
++++ misc/build/libxml2-2.7.6/config.sub	2011-09-26 18:05:31.000000000 +0200
+@@ -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-dietlibc | linux-android* | linux-newlib* | linux-uclibc* | \
+   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+   kopensolaris*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+@@ -1275,7 +1275,7 @@
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  	      | -chorusos* | -chorusrdb* | -cegcc* \
  	      | -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* \
 --- misc/libxml2-2.7.6/Makefile.in
 +++ misc/build/libxml2-2.7.6/Makefile.in
 @@ -41,9 +41,9 @@
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 83180edbb478..1c29a593a947 100755
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -137,7 +137,7 @@ EXTRPATH=URELIB
 OUT2LIB+=.libs$/libxml2.*.dylib
 OUT2BIN+=.libs$/xmllint
 OUT2BIN+=xml2-config
-.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
+.ELIF "$(OS)"=="IOS"
 OUT2LIB+=.libs$/libxml2.a
 OUT2BIN+=xml2-config
 .ELIF "$(OS)"=="WNT"
diff --git a/libxslt/libxslt-configure.patch b/libxslt/libxslt-configure.patch
index 3ec9de54ab47..003cd2c0cf8d 100644
--- a/libxslt/libxslt-configure.patch
+++ b/libxslt/libxslt-configure.patch
@@ -1,14 +1,23 @@
---- misc/libxslt-1.1.26/config.sub
-+++ misc/build/libxslt-1.1.26/config.sub
-@@ -1272,7 +1272,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* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+--- misc/libxslt-1.1.26/config.sub	2008-01-30 21:27:02.000000000 +0100
++++ misc/build/libxslt-1.1.26/config.sub	2011-09-26 23:35:00.000000000 +0200
+@@ -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
+@@ -1218,7 +1218,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* \
 --- misc/libxslt-1.1.26/ltmain.sh	Wed Aug 29 14:28:46 2007
 +++ misc/build/libxslt-1.1.26/ltmain.sh	Wed Jun 25 13:06:05 2008
 @@ -6195,9 +6195,9 @@
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 4767248bcbb5..9d77bba77ed7 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -156,7 +156,7 @@ OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib
 OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib
 OUT2BIN+=xsltproc$/.libs$/xsltproc
 OUT2BIN+=xslt-config
-.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" 
+.ELIF "$(OS)"=="IOS"
 OUT2LIB+=libxslt$/.libs$/libxslt.a
 OUT2LIB+=libexslt$/.libs$/libexslt.a
 OUT2BIN+=xslt-config
diff --git a/mythes/mythes-1.2.0-android.patch b/mythes/mythes-1.2.0-android.patch
index cb34b12dea84..2b74414cb3d5 100644
--- a/mythes/mythes-1.2.0-android.patch
+++ b/mythes/mythes-1.2.0-android.patch
@@ -1,11 +1,20 @@
---- misc/build/mythes-1.2.0/config.sub
-+++ misc/build/mythes-1.2.0/config.sub
-@@ -1272,7 +1272,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* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+--- misc/mythes-1.2.0/config.sub	2010-02-27 16:52:52.000000000 +0100
++++ misc/build/mythes-1.2.0/config.sub	2011-09-26 23:39:04.000000000 +0200
+@@ -123,7 +123,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* | \
+   kopensolaris*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+@@ -1294,7 +1294,7 @@
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  	      | -chorusos* | -chorusrdb* | -cegcc* \
  	      | -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* \
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 50cc9eea7bb2..3b6f696cee45 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -159,7 +159,7 @@ OUT2INC+=src$/raptor.h
 .IF "$(OS)"=="MACOSX"
 OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
 OUT2BIN+=src/raptor-config
-.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
+.ELIF "$(OS)"=="IOS"
 OUT2LIB+=src$/.libs$/libraptor.a
 OUT2BIN+=src/raptor-config
 .ELIF "$(OS)"=="AIX"
diff --git a/redland/raptor/raptor-1.4.18.patch.autotools b/redland/raptor/raptor-1.4.18.patch.autotools
index ed9e6bd75eff..4b43def56511 100644
--- a/redland/raptor/raptor-1.4.18.patch.autotools
+++ b/redland/raptor/raptor-1.4.18.patch.autotools
@@ -1,14 +1,3 @@
---- misc/raptor-1.4.18/config.sub
-+++ misc/build/raptor-1.4.18/config.sub
-@@ -1272,7 +1272,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* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- misc/raptor-1.4.18/configure	Sun Jun 15 10:25:55 2008
 +++ misc/build/raptor-1.4.18/configure	Wed Feb 18 13:23:12 2009
 @@ -4321,7 +4321,7 @@
author	Thorsten Behrens <tbehrens@novell.com>	2011-09-26 23:27:57 +0200
committer	Thorsten Behrens <tbehrens@novell.com>	2011-09-27 09:46:38 +0200
commit	04b8b4fbbb4b7f72f33d0b76b86945cb98c4ecd9 (patch)
tree	a9038a8c5081a246779a6d9b7fbfe0e774af725a
parent	47d7d1e987e1caa030c7623767d9dfe3d85eb924 (diff)