diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-25 15:04:17 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-25 15:04:17 +0000 |
| commit | cd83aeb5fdde8184aa8226a9334546c413c1b318 (patch) | |
| tree | f3b3cfdbf43d86c12ba053439d09f09953957ec8 /berkeleydb | |
| parent | 71520e71cd37d5fd96e7b0a5c1e8925186562655 (diff) | |
INTEGRATION: CWS c17v001_SRC680 (1.41.10); FILE MERGED
2007/09/28 11:33:27 jl 1.41.10.1: #b6606685 we use versioned symbols now for libdb-4.2.so ( Linux only ) to prevent crashes when the libc uses an incompatible libdb from the system.
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index c87c3055ce77..1eaa1fcea87a 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.41 $ +# $Revision: 1.42 $ # -# last change: $Author: hr $ $Date: 2007-06-27 17:46:49 $ +# last change: $Author: vg $ $Date: 2007-10-25 16:04:17 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -60,7 +60,7 @@ ADDITIONAL_FILES= \ hmac$/makefile.mk hsearch$/makefile.mk libdb_java$/makefile.mk lock$/makefile.mk \ log$/makefile.mk mp$/makefile.mk mutex$/makefile.mk os$/makefile.mk \ os_win32$/makefile.mk qam$/makefile.mk rep$/makefile.mk txn$/makefile.mk \ - xa$/makefile.mk libdb42.dxp libdb_java42.dxp + xa$/makefile.mk libdb42.dxp libdb_java42.dxp db_4_2_gcc3.map @@ -86,6 +86,10 @@ CXXFLAGS:=-fno-strict-aliasing .IF "$(OS)$(COM)"=="LINUXGCC" LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -Wl,-z,noexecstack .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 +LDFLAGSVERSION:= -Wl,--version-script=../db_4_2_gcc3.map +.EXPORT: LDFLAGSVERSION .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" #.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" |