[Libreoffice-commits] .: berkeleydb/db-4.7.25.patch berkeleydb/makefile.mk

[Tor Lillqvist]

 berkeleydb/db-4.7.25.patch |   11 +++++++++++
 berkeleydb/makefile.mk     |    2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit b0bfc72db9186d3cc3ba901f6deb97e3c91e9d8e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jun 9 19:40:37 2011 +0300

    Cross-compilation support for Android

diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch
index 8cf412d..6077e66 100644
--- a/berkeleydb/db-4.7.25.patch
+++ b/berkeleydb/db-4.7.25.patch
@@ -398,6 +398,17 @@
  	$(RM) -f $(libdb)
  	$(LN) -s .libs/$(libdb_version) $(libdb)
 
+--- 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* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- 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 20c5340..376b1d9 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"
+.IF "$(OS)"=="IOS" || "$(OS)" == "ANDROID"
 OUT2LIB=$(BUILD_DIR)$/libdb*.a
 .ELSE
 OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)