summaryrefslogtreecommitdiff
path: root/libxslt
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 /libxslt
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 'libxslt')
-rw-r--r--libxslt/libxslt-configure.patch27
-rw-r--r--libxslt/makefile.mk2
2 files changed, 19 insertions, 10 deletions
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