diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-09 19:40:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-09 19:40:37 +0300 |
| commit | d6964127f5e2c1a2ce6c29b5396bf4063120410c (patch) | |
| tree | 313389a7766eb7cc61a2c3ca7fba0c65cadc0b7e /berkeleydb | |
| parent | 496bba4a6898e0fda7a3ce0a74ed1dd254277992 (diff) | |
Cross-compilation support for Android
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/db-4.7.25.patch | 11 | ||||
| -rw-r--r-- | berkeleydb/makefile.mk | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch index 8cf412d23e25..6077e6669c77 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 20c53409c7ae..376b1d93dfe9 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) |