diff options
Diffstat (limited to 'berkeleydb/db-4.7.25.patch')
| -rw-r--r-- | berkeleydb/db-4.7.25.patch | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch index 30f252ef589c..c97522f62612 100644 --- a/berkeleydb/db-4.7.25.patch +++ b/berkeleydb/db-4.7.25.patch @@ -33,7 +33,7 @@ + $(SLO)$/bt_stat.obj \ + $(SLO)$/bt_upgrade.obj \ + $(SLO)$/bt_verify.obj \ -+ $(SLO)$/btree_auto.obj ++ $(SLO)$/btree_auto.obj + +.INCLUDE : target.mk + @@ -53,7 +53,7 @@ +INCPRE+=..$/build_windows ..$/dbinc ..$/ +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS + -+SLOFILES= $(SLO)$/strsep.obj ++SLOFILES= $(SLO)$/strsep.obj + +.INCLUDE : target.mk + @@ -88,7 +88,7 @@ + $(SLO)$/util_cache.obj \ + $(SLO)$/util_log.obj \ + $(SLO)$/util_sig.obj \ -+ $(SLO)$/zerofill.obj ++ $(SLO)$/zerofill.obj + +.INCLUDE : target.mk + @@ -119,7 +119,7 @@ + $(SLO)$/cxx_mpool.obj \ + $(SLO)$/cxx_multi.obj \ + $(SLO)$/cxx_seq.obj \ -+ $(SLO)$/cxx_txn.obj ++ $(SLO)$/cxx_txn.obj + +.INCLUDE : target.mk + @@ -324,7 +324,7 @@ + + local: + *; -+}; ++}; --- misc/db-4.7.25.NC/dbm/makefile.mk 2009-07-21 11:42:40.000000000 +0200 +++ misc/build/db-4.7.25.NC/dbm/makefile.mk 2009-07-21 11:39:25.000000000 +0200 @@ -1 +1,16 @@ @@ -375,29 +375,29 @@ @@ -13,7 +13,7 @@ libdir= @libdir@ docdir= $(prefix)/docs - + -dmode= 755 +dmode= 775 emode= 555 fmode= 444 - + @@ -56,6 +56,7 @@ CCLINK= @MAKEFILE_CCLINK@ @CFLAGS@ - + LDFLAGS= @LDFLAGS@ +LDFLAGSVERSION= @LDFLAGSVERSION@ LIBS= @LIBSO_LIBS@ TEST_LIBS= @TEST_LIBS@ LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@ @@ -733,7 +734,7 @@ - + # Shared C library. $(libso_target): $(C_OBJS) - $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS) + $(SOLINK) $(SOFLAGS) $(LDFLAGS) $(LDFLAGSVERSION) -o $@ $(C_OBJS) $(LIBCSO_LIBS) $(RM) -f $(libdb) $(LN) -s .libs/$(libdb_version) $(libdb) - + --- misc/db-4.7.25.NC/dist/configure 2008-05-15 23:12:41.000000000 +0200 +++ misc/build/db-4.7.25.NC/dist/configure 2009-07-21 11:39:25.000000000 +0200 @@ -3757,8 +3757,10 @@ @@ -410,7 +410,7 @@ +#CXXFLAGS=${CXXFLAGS-"$CFLAGS"} +CFLAGS="$CFLAGS $optimize_def" +CXXFLAGS="$CXXFLAGS $CFLAGS" - + # The default compiler is cc (NOT gcc), the default CFLAGS is as specified # above, NOT what is set by AC_PROG_CC, as it won't set optimization flags @@ -12566,7 +12568,8 @@ @@ -434,7 +434,7 @@ @@ -36655,7 +36659,7 @@ DB_VERSION_PATCH!$DB_VERSION_PATCH$ac_delim _ACEOF - + - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then break @@ -482,7 +482,7 @@ + $(SLO)$/env_region.obj \ + $(SLO)$/env_register.obj \ + $(SLO)$/env_sig.obj \ -+ $(SLO)$/env_stat.obj ++ $(SLO)$/env_stat.obj + +.INCLUDE : target.mk + @@ -646,12 +646,13 @@ + --- misc/db-4.7.25.NC/makefile.mk 2009-07-21 11:42:40.000000000 +0200 +++ misc/build/db-4.7.25.NC/makefile.mk 2009-07-21 11:39:26.000000000 +0200 -@@ -1 +1,80 @@ +@@ -1 +1,81 @@ -dummy +PRJ=..$/..$/..$/.. +PRJNAME=libdb47 +TARGET=libdb47 +USE_DEFFILE=true ++UWINAPILIB= + +.INCLUDE : settings.mk +CFLAGS+=-GS -EHsc -Gy @@ -669,7 +670,7 @@ + hash hmac hsearch lock \ + log mp mutex os os_windows \ + qam rep repmgr sequence \ -+ txn xa ++ txn xa + +LIB1TARGET= $(SLB)$/$(TARGET).lib +LIB1FILES= \ |