From 33474c4fff35faaedbd93461acb24496160f820f Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 22 Jun 2010 09:31:32 +0200 Subject: sb126: #i110197# remove -Wl,-z,noexecstack hack --- berkeleydb/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'berkeleydb') diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 963c61a3bbde..6b814163300b 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -76,7 +76,7 @@ CXXFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS) .IF "$(GUI)"=="UNX" .IF "$(OS)$(COM)"=="LINUXGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' .EXPORT: LDFLAGS #The current dir when linking is unxlngi6.pro/misc/build/db-4.2.52.NC/out # the map file is in unxlngi6.pro/misc/build/db-4.2.52.NC -- cgit From 8333d0d5eb9c287d0551573cbc62b146a9c598c2 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Tue, 20 Jul 2010 12:46:55 +0200 Subject: #i107097# - pass MAXPROCESS to GNU make in external modules --- berkeleydb/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'berkeleydb') diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 325e8700e7a8..0b6bbde381cb 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -107,7 +107,7 @@ CXXFLAGS+:=$(ARCH_FLAGS) BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR) -BUILD_ACTION=make +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) OUT2INC= \ -- cgit From 2f324e58ca1102a272f9c375b87910bb2e8fe6a3 Mon Sep 17 00:00:00 2001 From: tono Date: Thu, 6 Jan 2011 21:56:21 +0900 Subject: mingwport33: i#116329: MinGW port enhancement: configurable libstdc++ name --- berkeleydb/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'berkeleydb') diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 751af3ca687c..b27d483e9e60 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -135,7 +135,7 @@ db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR) db_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" CFLAGS+=-D_GLIBCXX_DLL -db_LIBS+=-lstdc++_s +db_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS) .IF "$(MINGW_SHARED_GCCLIB)"=="YES" -- cgit