diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-09-26 23:27:57 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-09-27 09:46:38 +0200 |
| commit | 04b8b4fbbb4b7f72f33d0b76b86945cb98c4ecd9 (patch) | |
| tree | a9038a8c5081a246779a6d9b7fbfe0e774af725a /berkeleydb | |
| parent | 47d7d1e987e1caa030c7623767d9dfe3d85eb924 (diff) | |
Make Android cross-build working
In the spirit of 12759f67a36d52a345be6002d7017551e8414c59, change
external lib's config.sub to eat the arm-unknown-linux-androideabi
host os string. Also, permit shared libs again - seems Android can
handle those.
Added dictionaries to cross-build-toolset - idxdict is needed.
Should build up to sfx2 - some residual static lib issues there,
and in raptor.
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/db-4.7.25.patch | 23 | ||||
| -rw-r--r-- | berkeleydb/makefile.mk | 2 |
2 files changed, 17 insertions, 8 deletions
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch index 6077e6669c77..67a3da6d1dfb 100644 --- a/berkeleydb/db-4.7.25.patch +++ b/berkeleydb/db-4.7.25.patch @@ -400,15 +400,24 @@ --- 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* \ +@@ -120,7 +120,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os +@@ -1247,7 +1247,7 @@ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ --- 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 0c4d8255cca1..93234f0dde9a 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" || "$(OS)" == "ANDROID" +.IF "$(OS)"=="IOS" OUT2LIB=$(BUILD_DIR)$/libdb*.a .ELSE OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) |