diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
| commit | 3feca961868cfd34893c07079214272a17f0bcb1 (patch) | |
| tree | c10d601cc292f9502b107a8748c4d3fbed018302 /berkeleydb/makefile.mk | |
| parent | 01a1ccf89482b29a5d0f9c04d1558464aa13ddc5 (diff) | |
| parent | 8adb1ff87a1a000e8b00be5bffb1680c604e0556 (diff) | |
merge commit
Diffstat (limited to 'berkeleydb/makefile.mk')
| -rw-r--r-- | berkeleydb/makefile.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 313d8f63afd7..bc5df6964bc5 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -40,7 +40,7 @@ TARGET=so_berkeleydb .IF "$(SYSTEM_DB)" == "YES" all: - @echo "An already available installation of db should exist on your system." + @echo "An already available installation of db should exist on your system." @echo "Therefore the version provided here does not need to be built in addition." .ENDIF @@ -100,7 +100,9 @@ CONFIGURE_DIR=out CONFIGURE_ACTION= \ ..$/dist$/configure CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 - +.IF "$(OS)"=="MACOSX" +CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" +.ENDIF # just pass ARCH_FLAGS to native build CFLAGS+:=$(ARCH_FLAGS) CXXFLAGS+:=$(ARCH_FLAGS) @@ -141,6 +143,7 @@ db_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR) db_LIBS=-lmingwthrd .IF "$(MINGW_SHARED_GXXLIB)"=="YES" +CFLAGS+=-D_GLIBCXX_DLL db_LIBS+=-lstdc++_s .ENDIF db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS) @@ -148,7 +151,7 @@ db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS) db_LIBXSO_LIBS+=-lgcc_s .ENDIF CONFIGURE_ACTION=..$/dist$/configure -CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)" +CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)" BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR) |