summaryrefslogtreecommitdiff
path: root/redland
diff options
context:
space:
mode:
Diffstat (limited to 'redland')
-rw-r--r--redland/raptor/makefile.mk2
-rw-r--r--redland/raptor/raptor-1.4.18.patch.autotools11
2 files changed, 1 insertions, 12 deletions
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 @@