File db-4.5.20.dif of Package libdb_java-4_5

Overview Repositories Revisions Requests Users Attributes Meta

File db-4.5.20.dif of Package libdb_java-4_5 (Revision 89fcb94c7f2addb2aacc1a8fa497d218)

Currently displaying revision 89fcb94c7f2addb2aacc1a8fa497d218 , Show latest

--- btree/bt_compact.c
+++ btree/bt_compact.c
@@ -388,7 +388,7 @@ __bam_compact_int(dbc, start, stop, fact
 	DB *dbp;
 	DBC *ndbc;
 	DB_ENV *dbenv;
-	DB_LOCK nolock;
+	DB_LOCK nolock = { 0, 0, 0, 0};
 	EPG *epg;
 	DB_MPOOLFILE *dbmp;
 	PAGE *pg, *ppg, *npg;
--- dist/Makefile.in
+++ dist/Makefile.in
@@ -139,8 +139,8 @@ libtso_major=	$(libtso_base)-$(LIBMAJOR)
 # local libraries, for example.  Do that by adding -I options to the DB185INC
 # line, and -l options to the DB185LIB line.
 ##################################################
-DB185INC=	-c @CFLAGS@ -I$(srcdir) @CPPFLAGS@
-DB185LIB=
+DB185INC=	-c @CFLAGS@ -I/usr/include/db1 @CPPFLAGS@
+DB185LIB=	-ldb1
 
 ##################################################
 # NOTHING BELOW THIS LINE SHOULD EVER NEED TO BE MODIFIED.
--- dist/aclocal/libtool.ac
+++ dist/aclocal/libtool.ac
@@ -2820,8 +2820,8 @@ if test "$GXX" = yes; then
   # Check if GNU C++ uses GNU ld as the underlying linker, since the
   # archiving commands below assume that GNU ld is being used.
   if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--- dist/configure.ac
+++ dist/configure.ac
@@ -747,15 +747,15 @@ LTLIBOBJS=`echo "$LIB@&t@OBJS" |
 AC_SUBST(LTLIBOBJS)
 
 # Initial output file list.
-CREATE_LIST="Makefile
-    db_cxx.h:$srcdir/../dbinc/db_cxx.in
-    db_int.h:$srcdir/../dbinc/db_int.in
-    clib_port.h:$srcdir/../dist/clib_port.h
+CREATE_LIST="Makefile \
+    db_cxx.h:$srcdir/../dbinc/db_cxx.in \
+    db_int.h:$srcdir/../dbinc/db_int.in \
+    clib_port.h:$srcdir/../dist/clib_port.h \
     include.tcl:$srcdir/../test/include.tcl"
 
 # MinGW needs win_db.h.
 if test "$db_cv_mingw" = "yes"; then
-CREATE_LIST="$CREATE_LIST
+CREATE_LIST="$CREATE_LIST \
     win_db.h:$srcdir/win_db.in"
 fi
 
@@ -763,10 +763,10 @@ fi
 # prototypes, and, if configured for unique names, a list of #defines
 # to do DB_VERSION_UNIQUE_NAME substitution.
 if test "$db_cv_uniquename" = "yes"; then
-	CREATE_LIST="$CREATE_LIST
+	CREATE_LIST="$CREATE_LIST \
 	db.h:$srcdir/../dbinc/db.in:$srcdir/../dbinc_auto/ext_def.in:$srcdir/../dbinc_auto/ext_prot.in"
 else
-	CREATE_LIST="$CREATE_LIST
+	CREATE_LIST="$CREATE_LIST \
 	db.h:$srcdir/../dbinc/db.in:$srcdir/../dbinc_auto/ext_prot.in"
 fi
 
@@ -774,7 +774,7 @@ fi
 # does the DB_VERSION_UNIQUE_NAME substitution), which is included by
 # the db_int.h file.
 if test "$db_cv_uniquename" = "yes"; then
-	CREATE_LIST="$CREATE_LIST
+	CREATE_LIST="$CREATE_LIST \
 	db_int_def.h:$srcdir/../dbinc_auto/int_def.in"
 	db_int_def='#include "db_int_def.h"'
 fi
@@ -784,12 +784,12 @@ fi
 # of #defines to do DB_VERSION_UNIQUE_NAME substitution.
 if test "$db_cv_compat185" = "yes"; then
 	if test "$db_cv_uniquename" = "yes"; then
-		CREATE_LIST="$CREATE_LIST
-		db_185.h:$srcdir/../dbinc/db_185.in:$srcdir/../dbinc_auto/ext_185_def.in:$srcdir/../dbinc_auto/ext_185_prot.in
+		CREATE_LIST="$CREATE_LIST \
+		db_185.h:$srcdir/../dbinc/db_185.in:$srcdir/../dbinc_auto/ext_185_def.in:$srcdir/../dbinc_auto/ext_185_prot.in \
 		db185_int.h:$srcdir/../db185/db185_int.in:$srcdir/../dbinc_auto/ext_185_def.in:$srcdir/../dbinc_auto/ext_185_prot.in"
 	else
-		CREATE_LIST="$CREATE_LIST
-		db_185.h:$srcdir/../dbinc/db_185.in:$srcdir/../dbinc_auto/ext_185_prot.in
+		CREATE_LIST="$CREATE_LIST \
+		db_185.h:$srcdir/../dbinc/db_185.in:$srcdir/../dbinc_auto/ext_185_prot.in \
 		db185_int.h:$srcdir/../db185/db185_int.in:$srcdir/../dbinc_auto/ext_185_prot.in"
 	fi
 fi

Places

File db-4.5.20.dif of Package libdb_java-4_5 (Revision 89fcb94c7f2addb2aacc1a8fa497d218)

Places