[Libreoffice-commits] .: 2 commits - openssl/makefile.mk redland/raptor redland/rasqal redland/redland

[Tor Lillqvist]

 openssl/makefile.mk                           |    2 +-
 redland/raptor/makefile.mk                    |    2 +-
 redland/raptor/raptor-1.4.18.patch.autotools  |   11 +++++++++++
 redland/rasqal/makefile.mk                    |    2 +-
 redland/rasqal/rasqal-0.9.16.patch.autotools  |   11 +++++++++++
 redland/redland/makefile.mk                   |    2 +-
 redland/redland/redland-1.0.8.patch.autotools |   11 +++++++++++
 7 files changed, 37 insertions(+), 4 deletions(-)

New commits:
commit a63802105e2df2c57c7bdad0ea6d5fd6e5a14a9a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 9 23:26:36 2011 +0300

    First attempt at Android support

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 3b6f696..50cc9ee 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"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
 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 4b43def..ed9e6bd 100644
--- a/redland/raptor/raptor-1.4.18.patch.autotools
+++ b/redland/raptor/raptor-1.4.18.patch.autotools
@@ -1,3 +1,14 @@
+--- 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 @@
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index dbad2d2..ce3a6cf 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -144,7 +144,7 @@ OUT2INC+=src$/rasqal.h
 .IF "$(OS)"=="MACOSX"
 OUT2LIB+=src$/.libs$/librasqal.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib
 OUT2BIN+=src/rasqal-config
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
 OUT2LIB+=src$/.libs$/librasqal.a
 OUT2BIN+=src/rasqal-config
 .ELIF "$(OS)"=="WNT"
diff --git a/redland/rasqal/rasqal-0.9.16.patch.autotools b/redland/rasqal/rasqal-0.9.16.patch.autotools
index 100499d..19b8792 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.autotools
+++ b/redland/rasqal/rasqal-0.9.16.patch.autotools
@@ -1,3 +1,14 @@
+--- misc/rasqal-0.9.16/config.sub
++++ misc/build/rasqal-0.9.16/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* | -cegcc* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- misc/rasqal-0.9.16/ltmain.sh	Tue Apr 29 23:33:55 2008
 +++ misc/build/rasqal-0.9.16/ltmain.sh	Wed Feb 18 13:25:00 2009
 @@ -1565,6 +1565,11 @@
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index b38c45a..4bed69e 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -147,7 +147,7 @@ OUT2INC+=librdf$/*.h
 
 .IF "$(OS)"=="MACOSX"
 OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
 OUT2LIB+=librdf$/.libs$/librdf.a
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
diff --git a/redland/redland/redland-1.0.8.patch.autotools b/redland/redland/redland-1.0.8.patch.autotools
index 5b29d0b..2bd2085 100644
--- a/redland/redland/redland-1.0.8.patch.autotools
+++ b/redland/redland/redland-1.0.8.patch.autotools
@@ -1,3 +1,14 @@
+--- misc/redland-1.0.8/config.sub
++++ misc/build/redland-1.0.8/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* | -cegcc* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- misc/redland-1.0.8/configure	Fri Jul  4 18:00:39 2008
 +++ misc/build/redland-1.0.8/configure	Wed Feb 18 13:27:43 2009
 @@ -4671,7 +4671,7 @@
commit b7e46a0b334f9c58ef291b4a29030192fc66673c
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 9 23:26:23 2011 +0300

    First attempt at Android support

diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index aff765f..21a8dc7 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -64,7 +64,7 @@ OUT2INC += include/openssl/*
 
 UNAME=$(shell uname)
 
-.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "ANDROID"
     PATCH_FILES=openssllnx.patch
     ADDITIONAL_FILES:= \
         libcrypto_OOo_0_9_8o.map \