diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-05-14 01:35:52 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-05-14 01:35:52 +0300 |
| commit | b5d29a7e7b6fd3a97c3b8988e5aad34e6bce42b5 (patch) | |
| tree | 6709ddd3eda3bef577259784db752b71c28bb3a9 /berkeleydb | |
| parent | 95c304f06bf3fe1d0ce7bf5601856e0c7da17acf (diff) | |
Cross-compilation support and iOS in particular
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 15 | ||||
| -rw-r--r-- | berkeleydb/prj/d.lst | 5 |
2 files changed, 15 insertions, 5 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 84d7e0b231eb..fc7b379a070d 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -94,10 +94,19 @@ CONFIGURE_DIR=out #relative to CONFIGURE_DIR CONFIGURE_ACTION= \ ..$/dist$/configure -CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 +CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-compat185 +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS+= --disable-shared +.ELSE +CONFIGURE_FLAGS+= --enable-shared +.ENDIF .IF "$(OS)"=="MACOSX" CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" .ENDIF +.IF "$(CROSS_COMPILING)"!="" +CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" +.ENDIF + # just pass ARCH_FLAGS to native build CFLAGS+:=$(ARCH_FLAGS) CXXFLAGS+:=$(ARCH_FLAGS) @@ -107,7 +116,11 @@ BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR) BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) +.IF "$(OS)"=="IOS" +OUT2LIB=$(BUILD_DIR)$/libdb*.a +.ELSE OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) +.ENDIF OUT2INC= \ $(BUILD_DIR)$/db.h diff --git a/berkeleydb/prj/d.lst b/berkeleydb/prj/d.lst index 78682f825e0b..6324294fa16d 100644 --- a/berkeleydb/prj/d.lst +++ b/berkeleydb/prj/d.lst @@ -3,13 +3,10 @@ mkdir: %_DEST%\inc%_EXT%\berkeleydb ..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h ..\%__SRC%\lib\libdb47.lib %_DEST%\lib%_EXT%\libdb47.lib - +..\%__SRC%\lib\libdb-4.7.a %_DEST%\lib%_EXT%\libdb-4.7.a ..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib%_EXT%\libdb-4.7.so - ..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib%_EXT%\libdb-4.7.dylib - ..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib%_EXT%\libdb-4.7.a - ..\%__SRC%\bin\libdb47.dll %_DEST%\bin%_EXT%\libdb47.dll |