summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-06-09 18:38:45 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-06-09 18:38:45 +0300
commit46c6d9533b36c587b657f1e0e6e34c59b8ef74a1 (patch)
tree2f174fe8b7532aa676bc519744bd871ac155b09a
parent971fbd84812400341e9858959cd812f85fd49e4c (diff)
Cross-compilation support for Android
-rw-r--r--libxslt/libxslt-configure.patch11
-rw-r--r--libxslt/makefile.mk2
2 files changed, 12 insertions, 1 deletions
diff --git a/libxslt/libxslt-configure.patch b/libxslt/libxslt-configure.patch
index bfa0b512824e..3ec9de54ab47 100644
--- a/libxslt/libxslt-configure.patch
+++ b/libxslt/libxslt-configure.patch
@@ -1,3 +1,14 @@
+--- 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* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
--- 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 7167adf3af46..dff40683bbda 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -138,7 +138,7 @@ OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib
OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib
OUT2BIN+=xsltproc$/.libs$/xsltproc
OUT2BIN+=xslt-config
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
OUT2LIB+=libxslt$/.libs$/libxslt.a
OUT2LIB+=libexslt$/.libs$/libexslt.a
OUT2BIN+=xslt-config