mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix berkeleydb mingw cross-build.

Browse Source
This commit is contained in:
Stephan Bergmann
2011-10-26 14:32:00 +02:00
parent 8df68b4e1f
commit 42b722a83a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
berkeleydb/makefile.mk
View File

@@ -131,14 +131,13 @@ OUT2INC= \
CONFIGURE_DIR=out CONFIGURE_DIR=out
#relative to CONFIGURE_DIR #relative to CONFIGURE_DIR
# TODO needs clean up # TODO needs clean up
CFLAGS+=-nostdinc
db_CC=$(CC) -mthreads db_CC=$(CC) -mthreads
db_CXX=$(CXX) -mthreads db_CXX=$(CXX) -mthreads
.IF "$(MINGW_SHARED_GCCLIB)"=="YES" .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
db_CC+=-shared-libgcc db_CC+=-shared-libgcc
db_CXX+=-shared-libgcc db_CXX+=-shared-libgcc
.ENDIF .ENDIF
db_LDFLAGS=-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin db_LDFLAGS=-L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin
db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR) db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR)
db_LIBS= db_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES" .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
@@ -150,7 +149,7 @@ db_LIBXSO_LIBS=$(db_LIBS)
db_LIBXSO_LIBS+=-lgcc_s db_LIBXSO_LIBS+=-lgcc_s
.ENDIF .ENDIF
CONFIGURE_ACTION=..$/dist$/configure CONFIGURE_ACTION=..$/dist$/configure
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)" CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --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=$(CONFIGURE_DIR)
BUILD_DIR_OUT=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR)