Index: db-3.2.9.patch =================================================================== RCS file: /cvs/oo/external/berkeleydb/db-3.2.9.patch,v retrieving revision 1.5 diff -u -r1.5 db-3.2.9.patch --- db-3.2.9.patch 2002/03/18 14:53:40 1.5 +++ db-3.2.9.patch 2002/06/07 04:53:18 @@ -1,5 +1,6 @@ -*** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_app.cpp Thu Jan 11 19:28:22 2001 ---- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp Mon Jun 11 15:50:55 2001 +diff -cr db-3.2.9-orig/cxx/cxx_app.cpp db-3.2.9/cxx/cxx_app.cpp +*** db-3.2.9-orig/cxx/cxx_app.cpp Thu Jan 11 18:28:22 2001 +--- build/unxsols3.pro/db-3.2.9/cxx/cxx_app.cpp Thu Jun 6 21:54:52 2002 *************** *** 7,12 **** --- 7,14 ---- @@ -11,8 +12,9 @@ #ifndef lint static const char revid[] = "$Id: cxx_app.cpp,v 11.38 2000/12/21 20:30:18 dda Exp $"; #endif /* not lint */ -*** ./unxsols3.pro/misc/db-3.2.9/cxx/cxx_table.cpp Thu Jan 11 19:28:22 2001 ---- build/unxsols3.pro/db-3.2.9/cxx/cxx_table.cpp Mon Jun 11 15:51:59 2001 +diff -cr db-3.2.9-orig/cxx/cxx_table.cpp db-3.2.9/cxx/cxx_table.cpp +*** db-3.2.9-orig/cxx/cxx_table.cpp Thu Jan 11 18:28:22 2001 +--- build/unxsols3.pro/db-3.2.9/cxx/cxx_table.cpp Thu Jun 6 21:54:52 2002 *************** *** 7,12 **** --- 7,14 ---- @@ -24,8 +26,9 @@ #ifndef lint static const char revid[] = "$Id: cxx_table.cpp,v 11.35 2001/01/11 18:19:49 bostic Exp $"; #endif /* not lint */ -*** ./unxsols3.pro/misc/db-3.2.9/dist/Makefile.in Fri Dec 1 00:07:33 2000 ---- build/unxsols3.pro/db-3.2.9/dist/Makefile.in Mon Jun 11 15:39:41 2001 +diff -cr db-3.2.9-orig/dist/Makefile.in db-3.2.9/dist/Makefile.in +*** db-3.2.9-orig/dist/Makefile.in Thu Nov 30 23:07:33 2000 +--- build/unxsols3.pro/db-3.2.9/dist/Makefile.in Thu Jun 6 23:08:58 2002 *************** *** 8,14 **** ################################################## @@ -43,44 +46,320 @@ CC= @MAKEFILE_CC@ CCLINK= @MAKEFILE_CCLINK@ -*** ./unxsols3.pro/misc/db-3.2.9/dist/configure.old Tue Jan 8 13:55:08 2002 ---- build/unxsols3.pro/db-3.2.9/dist/configure Tue Jan 8 13:56:05 2002 +diff -cr db-3.2.9-orig/dist/configure db-3.2.9/dist/configure +*** db-3.2.9-orig/dist/configure Wed Jan 24 15:16:18 2001 +--- build/unxsols3.pro/db-3.2.9/dist/configure Fri Jun 7 00:17:53 2002 *************** -*** 1795,1800 **** ---- 1795,1802 ---- +*** 995,1000 **** +--- 995,1001 ---- + CPPFLAGS="-D_REENTRANT $CPPFLAGS";; + mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" + LIBS="-lsocket -lsvipc $LIBS";; ++ netbsd*) optimize_def="-O2";; + osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; + *qnx) cat >> confdefs.h <<\EOF + #define HAVE_QNX 1 +*************** +*** 1750,1757 **** + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then +! ac_cv_path_JAVACABS="$ac_dir/$ac_word" +! break + fi + done + IFS="$ac_save_ifs" +--- 1751,1760 ---- + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then +! if test $SOLARENV/$OUTPATH/bin != $ac_dir; then +! ac_cv_path_JAVACABS="$ac_dir/$ac_word" +! break +! fi + fi + done + IFS="$ac_save_ifs" +*************** +*** 1781,1800 **** + echo "$ac_t""$JAVACABS" 1>&6 + done + JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +! if test -f "$JTOPDIR/include/jni.h"; then +! CPPFLAGS="$CPPFLAGSS -I$JTOPDIR/include" +! else +! JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'` +! if test -f "$JTOPDIR/include/jni.h"; then +! CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" +! else +! { echo "configure: error: cannot find java include files" 1>&2; exit 1; } +! fi +! fi + case "$host_os" in solaris*) JINCSUBDIRS="solaris";; linux*) JINCSUBDIRS="linux genunix";; -+ irix*) JINCSUBDIRS="irix";; -+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; *) JINCSUBDIRS="genunix";; esac + +--- 1784,1822 ---- + echo "$ac_t""$JAVACABS" 1>&6 + done + JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +! # [ed] 12/23/01 On OS X/darwin the java include directory is named the traditional Headers +! # name and not include +! # [ed] 2/28/02 Make this generic for darwin +! case "$host_os" in +! darwin*) +! JFRAMEDIR=`echo "$JTOPDIR" | sed -e 's:JavaVM.framework.*$:JavaVM.framework:'` +! echo "$JFRAMEDIR" +! if test -f "$JFRAMEDIR/Headers/jni.h"; then +! CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers" +! else +! { echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Headers/jni.h)" 1>&2; exit 1; } +! fi +! ;; +! *) +! if test -f "$JTOPDIR/include/jni.h"; then +! CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" +! else +! { echo "configure: error: cannot find java include files" 1>&2; exit 1; } +! JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'` +! if test -f "$JTOPDIR/include/jni.h"; then +! CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include" +! else +! { echo "configure: error: cannot find java include files" 1>&2; exit 1; } +! fi +! fi +! ;; +! esac + + case "$host_os" in + solaris*) JINCSUBDIRS="solaris";; + linux*) JINCSUBDIRS="linux genunix";; ++ irix*) JINCSUBDIRS="irix";; ++ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; + *) JINCSUBDIRS="genunix";; + esac + +diff -cr db-3.2.9-orig/dist/ltconfig db-3.2.9/dist/ltconfig +*** db-3.2.9-orig/dist/ltconfig Fri Oct 13 20:23:00 2000 +--- build/unxsols3.pro/db-3.2.9/dist/ltconfig Thu Jun 6 23:12:47 2002 +*************** +*** 678,683 **** +--- 678,688 ---- + cygwin* | mingw* | os2*) + # We can build DLLs from non-PIC. + ;; ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ pic_flag='-fno-common' ++ ;; + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, +*************** +*** 1194,1204 **** + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else + archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' + # can we support soname and/or expsyms with a.out? -oliva + fi + ;; + +--- 1199,1210 ---- + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' + # can we support soname and/or expsyms with a.out? -oliva ++ else ++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ need_version=no + fi + ;; + +*************** +*** 1371,1376 **** +--- 1377,1399 ---- + hardcode_shlibpath_var=no + ;; + ++ darwin* | rhapsody*) ++ case "$host_os" in ++ rhapsody* | darwin1.[012]) ++ allow_undefined_flag='-undefined suppress' ++ ;; ++ *) # Darwin 1.3 on ++ allow_undefined_flag='-flat_namespace -undefined suppress' ++ ;; ++ esac ++ archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $verstring' ++ # We need to add '_' to the symbols in $export_symbols first ++ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ whole_archive_flag_spec='-all_load $convenience' ++ ;; ++ + hpux9* | hpux10* | hpux11*) + case "$host_os" in + hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;; +*************** +*** 1443,1454 **** + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; +- rhapsody*) +- archive_cmds='$CC -bundle -undefined suppress -o $lib $libobjs $deplibs $linkopts' +- hardcode_libdir_flags_spec='-L$libdir' +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- ;; + + sco3.2v5*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts' +--- 1466,1471 ---- +*************** +*** 1919,1924 **** +--- 1936,1962 ---- + esac + ;; ---- misc/build/db-3.2.9/dist/configure.orig Sat Nov 24 14:56:48 2001 -+++ misc/build/db-3.2.9/dist/configure Sat Nov 24 14:57:32 2001 -@@ -995,6 +995,7 @@ - CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - mpeix*) CPPFLAGS="-D_POSIX_SOURCE -D_SOCKET_SOURCE $CPPFLAGS" - LIBS="-lsocket -lsvipc $LIBS";; -+netbsd*) optimize_def="-O2";; - osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";; - *qnx) cat >> confdefs.h <<\EOF - #define HAVE_QNX 1 ---- misc/build/db-3.2.9/dist/ltconfig.orig Sat Nov 24 14:56:10 2001 -+++ misc/build/db-3.2.9/dist/ltconfig Sat Nov 24 14:56:34 2001 -@@ -1194,11 +1194,12 @@ - - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else - archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' - # can we support soname and/or expsyms with a.out? -oliva -+ else -+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ need_version=no - fi - ;; - ++ darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ deplibs_check_method='file_magic Mach-O dynamically linked shared library' ++ file_magic_cmd='/usr/bin/file -L' ++ case "$host_os" in ++ rhapsody* | darwin1.[012]) ++ file_magic_test_file='/System/Library/Frameworks/System.framework/System' ++ ;; ++ *) # Darwin 1.3 on ++ file_magic_test_file='/usr/lib/libSystem.dylib' ++ ;; ++ esac ++ library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)' ++ soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ ;; ++ + gnu*) + version_type=linux + need_lib_prefix=no +*************** +*** 2055,2068 **** + deplibs_check_method='pass_all' + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +- ;; +- +- rhapsody*) +- version_type=sunos +- library_names_spec='${libname}.so' +- soname_spec='${libname}.so' +- shlibpath_var=DYLD_LIBRARY_PATH +- deplibs_check_method=pass_all + ;; + + sco3.2v5*) +--- 2093,2098 ---- +diff -cr db-3.2.9-orig/dist/ltmain.sh db-3.2.9/dist/ltmain.sh +*** db-3.2.9-orig/dist/ltmain.sh Sun Aug 6 18:32:00 2000 +--- build/unxsols3.pro/db-3.2.9/dist/ltmain.sh Thu Jun 6 23:07:08 2002 +*************** +*** 1079,1084 **** +--- 1079,1089 ---- + # These systems don't actually have c library (as such) + continue + ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C library is in the System framework ++ deplibs="$deplibs -framework System" ++ continue ++ ;; + esac + elif test "$arg" = "-lm"; then + case "$host" in +*************** +*** 1086,1091 **** +--- 1091,1101 ---- + # These systems don't actually have math library (as such) + continue + ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody math library is in the System framework ++ deplibs="$deplibs -framework System" ++ continue ++ ;; + esac + fi + deplibs="$deplibs $arg" +*************** +*** 1753,1758 **** +--- 1763,1778 ---- + versuffix="-$major-$age-$revision" + ;; + ++ darwin) ++ # Like Linux, but with the current version available in ++ # verstring for coding it into the library header ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" ++ # Darwin ld doesn't like 0 for these options... ++ minor_current=`expr $current + 1` ++ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ++ ;; ++ + *) + $echo "$modename: unknown library version type \`$version_type'" 1>&2 + echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +*************** +*** 1763,1769 **** + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= +! verstring="0.0" + if test "$need_version" = no; then + versuffix= + else +--- 1783,1798 ---- + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= +! case "$version_type" in +! darwin) +! # we can't check for "0.0" in archive_cmds due to quoting +! # problems, so we reset it completely +! verstring="" +! ;; +! *) +! verstring="0.0" +! ;; +! esac + if test "$need_version" = no; then + versuffix= + else +*************** +*** 1803,1808 **** +--- 1832,1842 ---- + # defer to whether the user wants -lc, or -lc_r + ;; + ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C library is in the System framework ++ deplibs="$deplibs -framework System" ++ ;; ++ + *) + # Add libc to deplibs on all other systems. + deplibs="$deplibs -lc" Index: makefile.mk =================================================================== RCS file: /cvs/oo/external/berkeleydb/makefile.mk,v retrieving revision 1.6 diff -u -r1.6 makefile.mk --- makefile.mk 2002/02/08 15:18:17 1.6 +++ makefile.mk 2002/06/07 04:53:19 @@ -85,7 +85,7 @@ BUILD_DIR=$(CONFIGURE_DIR) BUILD_ACTION=make -OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*.so +OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) OUT2BIN=java$/classes$/db.jar