diff options
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/db-4.7.25-mingw.patch | 348 | ||||
| -rw-r--r-- | berkeleydb/db-4.7.25.patch | 1059 | ||||
| -rw-r--r-- | berkeleydb/db-aix.patch | 205 | ||||
| -rw-r--r-- | berkeleydb/makefile.mk | 187 | ||||
| -rw-r--r-- | berkeleydb/prj/build.lst | 3 | ||||
| -rw-r--r-- | berkeleydb/prj/d.lst | 12 |
6 files changed, 1814 insertions, 0 deletions
diff --git a/berkeleydb/db-4.7.25-mingw.patch b/berkeleydb/db-4.7.25-mingw.patch new file mode 100644 index 000000000000..38d83d156230 --- /dev/null +++ b/berkeleydb/db-4.7.25-mingw.patch @@ -0,0 +1,348 @@ +--- misc/db-4.7.25.NC/dist/Makefile.in 2008-05-06 12:03:36.000000000 +0900 ++++ misc/build/db-4.7.25.NC/dist/Makefile.in 2009-07-11 13:38:07.419875000 +0900 +@@ -44,7 +44,7 @@ + SOLINK= @MAKEFILE_SOLINK@ @CFLAGS@ + SOFLAGS= @SOFLAGS@ + LIBMAJOR= @DB_VERSION_MAJOR@ +-LIBVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@ ++LIBVERSION= @DB_VERSION_MAJOR@@DB_VERSION_MINOR@ + + CPPFLAGS= -I$(builddir) -I$(srcdir) @CPPFLAGS@ + +@@ -62,18 +62,18 @@ + + libdb_base= libdb + libdb= $(libdb_base).a +-libdb_version= $(libdb_base)-$(LIBVERSION).a +-libso= $(libdb_base)-$(LIBVERSION)@SOSUFFIX@ +-libso_target= $(libdb_base)-$(LIBVERSION).la ++libdb_version= $(libdb_base)$(LIBVERSION).a ++libso= $(libdb_base)$(LIBVERSION)@SOSUFFIX@ ++libso_target= $(libdb_base)$(LIBVERSION).la + libso_default= $(libdb_base)@SOSUFFIX@ +-libso_major= $(libdb_base)-$(LIBMAJOR)@SOSUFFIX@ ++libso_major= $(libdb_base)$(LIBMAJOR)@SOSUFFIX@ + + ################################################## + # C++ API. + # + # C++ support is optional, and can be built with static or shared libraries. + ################################################## +-CXXFLAGS= -c $(CPPFLAGS) @CXXFLAGS@ ++CXXFLAGS= -c $(SOLARINC) $(CPPFLAGS) -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) @CXXFLAGS@ + CXX= @MAKEFILE_CXX@ + CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@ + XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@ +@@ -81,11 +81,11 @@ + + libcxx_base= libdb_cxx + libcxx= $(libcxx_base).a +-libcxx_version= $(libcxx_base)-$(LIBVERSION).a +-libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@ +-libxso_target= $(libcxx_base)-$(LIBVERSION).la ++libcxx_version= $(libcxx_base)$(LIBVERSION).a ++libxso= $(libcxx_base)$(LIBVERSION)@SOSUFFIX@ ++libxso_target= $(libcxx_base)$(LIBVERSION).la + libxso_default= $(libcxx_base)@SOSUFFIX@ +-libxso_major= $(libcxx_base)-$(LIBMAJOR)@SOSUFFIX@ ++libxso_major= $(libcxx_base)$(LIBMAJOR)@SOSUFFIX@ + + ################################################## + # Java API. +@@ -108,12 +108,12 @@ + libj_jarfile= db.jar + libj_exjarfile= dbexamples.jar + libjso_base= libdb_java +-libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@ +-libjso_static= $(libjso_base)-$(LIBVERSION).a +-libjso_target= $(libjso_base)-$(LIBVERSION).la ++libjso= $(libjso_base)$(LIBVERSION)@JMODSUFFIX@ ++libjso_static= $(libjso_base)$(LIBVERSION).a ++libjso_target= $(libjso_base)$(LIBVERSION).la + libjso_default= $(libjso_base)@JMODSUFFIX@ +-libjso_major= $(libjso_base)-$(LIBMAJOR)@JMODSUFFIX@ +-libjso_g= $(libjso_base)-$(LIBVERSION)_g@JMODSUFFIX@ ++libjso_major= $(libjso_base)$(LIBMAJOR)@JMODSUFFIX@ ++libjso_g= $(libjso_base)$(LIBVERSION)_g@JMODSUFFIX@ + + ################################################## + # TCL API. +@@ -123,11 +123,11 @@ + TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@ + LIBTSO_LIBS= @LIBTSO_LIBS@ @LIBSO_LIBS@ + libtso_base= libdb_tcl +-libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@ +-libtso_static= $(libtso_base)-$(LIBVERSION).a +-libtso_target= $(libtso_base)-$(LIBVERSION).la ++libtso= $(libtso_base)$(LIBVERSION)@MODSUFFIX@ ++libtso_static= $(libtso_base)$(LIBVERSION).a ++libtso_target= $(libtso_base)$(LIBVERSION).la + libtso_default= $(libtso_base)@MODSUFFIX@ +-libtso_major= $(libtso_base)-$(LIBMAJOR)@MODSUFFIX@ ++libtso_major= $(libtso_base)$(LIBMAJOR)@MODSUFFIX@ + + ################################################## + # db_dump185 UTILITY +@@ -756,7 +756,7 @@ + + # Shared Java library. + $(libjso_target): $(JAVA_OBJS) $(C_OBJS) +- $(SOLINK) -shrext @JMODSUFFIX@ $(SOFLAGS) $(LDFLAGS) \ ++ $(SOLINK) -shrext @JMODSUFFIX@ -add-underscore $(SOFLAGS) $(LDFLAGS) \ + -o $@ $(JAVA_OBJS) $(C_OBJS) $(LIBJSO_LIBS) + + # Shared Tcl library. +--- misc/db-4.7.25.NC/dist/configure 2008-05-16 06:12:41.000000000 +0900 ++++ misc/build/db-4.7.25.NC/dist/configure 2009-07-11 16:00:39.255625000 +0900 +@@ -9488,7 +9488,7 @@ + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ archive_cmds='$DLLTOOL $add_underscore --export-all-symbols --dllname $soname --output-lib $lib --output-exp $output_objdir/$soname.exp $libobjs; $CC -shared $output_objdir/$soname.exp $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--image-base=0x10000000' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +@@ -9497,7 +9497,7 @@ + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ $DLLTOOL $add_underscore --dllname $soname --output-lib $lib --output-exp $output_objdir/$soname.exp --input-def $output_objdir/$soname.def; $CC -shared $output_objdir/$soname.exp $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base ${wl}--image-base=0x10000000' + else + ld_shlibs=no + fi +@@ -13680,15 +13680,15 @@ + + if test "$pre_test_object_deps_done" = no; then + if test -z "$predep_objects_CXX"; then +- predep_objects_CXX="$p" ++ predep_objects_CXX=`cygpath -m "$p"` + else +- predep_objects_CXX="$predep_objects_CXX $p" ++ predep_objects_CXX="$predep_objects_CXX "`cygpath -m "$p"` + fi + else + if test -z "$postdep_objects_CXX"; then +- postdep_objects_CXX="$p" ++ postdep_objects_CXX=`cygpath -m "$p"` + else +- postdep_objects_CXX="$postdep_objects_CXX $p" ++ postdep_objects_CXX="$postdep_objects_CXX "`cygpath -m "$p"` + fi + fi + ;; +@@ -22371,6 +22371,154 @@ + + + ++case "$host_os" in ++mingw*) ++for ac_header in execinfo.h sys/time.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++## ---------------------------------------------------------- ## ++## Report this to Oracle Technology Network Berkeley DB forum ## ++## ---------------------------------------------------------- ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++;; ++*) + for ac_header in execinfo.h sys/select.h sys/socket.h sys/time.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +@@ -22515,6 +22663,8 @@ + + done + ++;; ++esac + { echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5 + echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; } + if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then +@@ -27697,6 +27847,18 @@ + + + ++ac_cv_sizeof_char_p=`echo $ac_cv_sizeof_char_p | tr -d '\015'` ++ac_cv_sizeof_unsigned_int=`echo $ac_cv_sizeof_unsigned_int | tr -d '\015'` ++ac_cv_sizeof_unsigned_char=`echo $ac_cv_sizeof_unsigned_char | tr -d '\015'` ++ac_cv_sizeof_unsigned_short=`echo $ac_cv_sizeof_unsigned_short | tr -d '\015'` ++ac_cv_sizeof_unsigned_long=`echo $ac_cv_sizeof_unsigned_long | tr -d '\015'` ++ac_cv_sizeof_unsigned_long_long=`echo $ac_cv_sizeof_unsigned_long_long | tr -d '\015'` ++ac_cv_sizeof_int=`echo $ac_cv_sizeof_int | tr -d '\015'` ++ac_cv_sizeof_char=`echo $ac_cv_sizeof_char | tr -d '\015'` ++ac_cv_sizeof_short=`echo $ac_cv_sizeof_short | tr -d '\015'` ++ac_cv_sizeof_long=`echo $ac_cv_sizeof_long | tr -d '\015'` ++ac_cv_sizeof_long_long=`echo $ac_cv_sizeof_long_long | tr -d '\015'` ++ + # We look for u_char, u_short, u_int, u_long -- if we can't find them, + # we create our own. + +--- misc/db-4.7.25.NC/dist/ltmain.sh 2006-06-27 10:03:33.000000000 +0900 ++++ misc/build/db-4.7.25.NC/dist/ltmain.sh 2009-07-11 13:38:07.388625000 +0900 +@@ -1103,6 +1103,7 @@ + lib_search_path=`pwd` + inst_prefix_dir= + ++ add_underscore= + avoid_version=no + dlfiles= + dlprefiles= +@@ -1435,6 +1436,11 @@ + prevarg="$arg" + + case $arg in ++ -add-underscore) ++ add_underscore="--add-underscore" ++ continue ++ ;; ++ + -all-static) + if test -n "$link_static_flag"; then + compile_command="$compile_command $link_static_flag" +@@ -4869,7 +4875,7 @@ + esac + # test for cygwin because mv fails w/o .exe extensions + case $host in +- *cygwin*) ++ *cygwin* | *mingw*) + exeext=.exe + outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; + *) exeext= ;; diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch new file mode 100644 index 000000000000..6077e6669c77 --- /dev/null +++ b/berkeleydb/db-4.7.25.patch @@ -0,0 +1,1059 @@ +--- misc/db-4.7.25.NC/btree/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/btree/makefile.mk 2009-07-21 11:39:25.000000000 +0200 +@@ -1 +1,35 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=btree ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/bt_compact.obj \ ++ $(SLO)$/bt_compare.obj \ ++ $(SLO)$/bt_conv.obj \ ++ $(SLO)$/bt_curadj.obj \ ++ $(SLO)$/bt_cursor.obj \ ++ $(SLO)$/bt_delete.obj \ ++ $(SLO)$/bt_method.obj \ ++ $(SLO)$/bt_open.obj \ ++ $(SLO)$/bt_put.obj \ ++ $(SLO)$/bt_rec.obj \ ++ $(SLO)$/bt_reclaim.obj \ ++ $(SLO)$/bt_recno.obj \ ++ $(SLO)$/bt_rsearch.obj \ ++ $(SLO)$/bt_search.obj \ ++ $(SLO)$/bt_split.obj \ ++ $(SLO)$/bt_stat.obj \ ++ $(SLO)$/bt_upgrade.obj \ ++ $(SLO)$/bt_verify.obj \ ++ $(SLO)$/btree_auto.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/clib/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/clib/makefile.mk 2009-07-21 11:39:25.000000000 +0200 +@@ -1 +1,16 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=clib ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/dbinc ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= $(SLO)$/strsep.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/common/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/common/makefile.mk 2009-07-21 11:39:25.000000000 +0200 +@@ -1 +1,31 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=common ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/crypto_stub.obj \ ++ $(SLO)$/db_byteorder.obj \ ++ $(SLO)$/db_err.obj \ ++ $(SLO)$/db_getlong.obj \ ++ $(SLO)$/db_idspace.obj \ ++ $(SLO)$/db_log2.obj \ ++ $(SLO)$/db_shash.obj \ ++ $(SLO)$/dbt.obj \ ++ $(SLO)$/mkpath.obj \ ++ $(SLO)$/openflags.obj \ ++ $(SLO)$/os_method.obj \ ++ $(SLO)$/util_cache.obj \ ++ $(SLO)$/util_log.obj \ ++ $(SLO)$/util_sig.obj \ ++ $(SLO)$/zerofill.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/cxx/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/cxx/makefile.mk 2009-07-21 11:39:25.000000000 +0200 +@@ -1 +1,27 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=cxx ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/cxx_db.obj \ ++ $(SLO)$/cxx_dbc.obj \ ++ $(SLO)$/cxx_dbt.obj \ ++ $(SLO)$/cxx_env.obj \ ++ $(SLO)$/cxx_except.obj \ ++ $(SLO)$/cxx_lock.obj \ ++ $(SLO)$/cxx_logc.obj \ ++ $(SLO)$/cxx_mpool.obj \ ++ $(SLO)$/cxx_multi.obj \ ++ $(SLO)$/cxx_seq.obj \ ++ $(SLO)$/cxx_txn.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/db/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/db/makefile.mk 2009-07-21 11:39:25.000000000 +0200 +@@ -1 +1,47 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=db_src ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/crdel_auto.obj \ ++ $(SLO)$/crdel_rec.obj \ ++ $(SLO)$/db.obj \ ++ $(SLO)$/db_am.obj \ ++ $(SLO)$/db_auto.obj \ ++ $(SLO)$/db_cam.obj \ ++ $(SLO)$/db_cds.obj \ ++ $(SLO)$/db_conv.obj \ ++ $(SLO)$/db_dispatch.obj \ ++ $(SLO)$/db_dup.obj \ ++ $(SLO)$/db_iface.obj \ ++ $(SLO)$/db_join.obj \ ++ $(SLO)$/db_meta.obj \ ++ $(SLO)$/db_method.obj \ ++ $(SLO)$/db_open.obj \ ++ $(SLO)$/db_overflow.obj \ ++ $(SLO)$/db_ovfl_vrfy.obj \ ++ $(SLO)$/db_pr.obj \ ++ $(SLO)$/db_rec.obj \ ++ $(SLO)$/db_reclaim.obj \ ++ $(SLO)$/db_remove.obj \ ++ $(SLO)$/db_rename.obj \ ++ $(SLO)$/db_ret.obj \ ++ $(SLO)$/db_setid.obj \ ++ $(SLO)$/db_setlsn.obj \ ++ $(SLO)$/db_stati.obj \ ++ $(SLO)$/db_truncate.obj \ ++ $(SLO)$/db_upg.obj \ ++ $(SLO)$/db_upg_opd.obj \ ++ $(SLO)$/db_vrfy.obj \ ++ $(SLO)$/db_vrfyutil.obj ++ ++.INCLUDE: target.mk ++ +--- misc/db-4.7.25.NC/db_4_7_gcc4.map 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/db_4_7_gcc4.map 2009-07-21 11:39:25.000000000 +0200 +@@ -1 +1,147 @@ +-dummy ++DB_4_7 { ++ global: ++__bam_adj_read; ++__bam_cadjust_read; ++__bam_cdel_read; ++__bam_curadj_read; ++__bam_merge_44_read; ++__bam_merge_read; ++__bam_pgno_read; ++__bam_relink_read; ++__bam_relink_43_read; ++__bam_repl_read; ++__bam_root_read; ++__bam_rcuradj_read; ++__bam_rsplit_read; ++__bam_split_read; ++__config_split; ++__crdel_inmem_create_read; ++__crdel_inmem_rename_read; ++__crdel_inmem_remove_read; ++__crdel_metasub_read; ++__db_add_recovery_int; ++__db_addrem_read; ++__db_big_read; ++__db_cksum_read; ++__db_dbm_close; ++__db_dbm_delete; ++__db_dbm_fetch; ++__db_dbm_firstkey; ++__db_dbm_init; ++__db_dbm_nextkey; ++__db_dbm_store; ++__db_debug_read; ++__db_dispatch; ++__db_dumptree; ++__db_hcreate; ++__db_hdestroy; ++__db_hsearch; ++__db_idspace; ++__db_mkpath; ++__db_ndbm_clearerr; ++__db_ndbm_close; ++__db_ndbm_delete; ++__db_ndbm_dirfno; ++__db_ndbm_error; ++__db_ndbm_fetch; ++__db_ndbm_firstkey; ++__db_ndbm_nextkey; ++__db_ndbm_open; ++__db_ndbm_pagfno; ++__db_ndbm_rdonly; ++__db_ndbm_store; ++__db_noop_read; ++__db_pg_alloc_42_read; ++__db_pg_alloc_read; ++__db_pg_free_42_read; ++__db_pg_free_read; ++__db_pg_freedata_42_read; ++__db_pg_freedata_read; ++__db_pg_init_read; ++__db_pg_sort_read; ++__db_pr_callback; ++__db_relink_42_read; ++__db_rpath; ++__db_getlong; ++__db_getulong; ++__db_ovref_read; ++__dbreg_register_read; ++__fop_create_read; ++__fop_file_remove_read; ++__fop_remove_read; ++__fop_rename_read; ++__fop_write_read; ++__ham_chgpg_read; ++__ham_copypage_read; ++__ham_curadj_read; ++__ham_groupalloc_42_read; ++__ham_groupalloc_read; ++__ham_insdel_read; ++__ham_metagroup_42_read; ++__ham_metagroup_read; ++__ham_newpage_read; ++__ham_replace_read; ++__ham_splitdata_read; ++__lock_list_print; ++__os_abspath; ++__os_calloc; ++__os_closehandle; ++__os_ctime; ++__os_dirfree; ++__os_dirlist; ++__os_free; ++__os_fsync; ++__os_getenv; ++__os_mkdir; ++__os_open; ++__os_read; ++__os_rename; ++__os_strdup; ++__os_unlink; ++__os_write; ++__os_yield; ++__os_id; ++__qam_add_read; ++__qam_del_read; ++__qam_delext_read; ++__qam_incfirst_read; ++__qam_mvptr_read; ++__txn_ckp_read; ++__txn_ckp_42_read; ++__txn_child_read; ++__txn_recycle_read; ++__txn_regop_42_read; ++__txn_regop_read; ++__txn_xa_regop_read; ++db_create; ++db_env_create; ++db_env_set_func_close; ++db_env_set_func_dirfree; ++db_env_set_func_dirlist; ++db_env_set_func_exists; ++db_env_set_func_file_map; ++db_env_set_func_free; ++db_env_set_func_fsync; ++db_env_set_func_ftruncate; ++db_env_set_func_ioinfo; ++db_env_set_func_malloc; ++db_env_set_func_open; ++db_env_set_func_pread; ++db_env_set_func_pwrite; ++db_env_set_func_read; ++db_env_set_func_realloc; ++db_env_set_func_region_map; ++db_env_set_func_rename; ++db_env_set_func_seek; ++db_env_set_func_unlink; ++db_env_set_func_write; ++db_env_set_func_yield; ++db_sequence_create; ++db_strerror; ++db_version; ++db_xa_switch; ++log_compare; ++ ++ 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 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=dbm ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= $(SLO)$/dbm.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/dbreg/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/dbreg/makefile.mk 2009-07-21 11:39:25.000000000 +0200 +@@ -1 +1,21 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=dbreg ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/dbreg.obj \ ++ $(SLO)$/dbreg_auto.obj \ ++ $(SLO)$/dbreg_rec.obj \ ++ $(SLO)$/dbreg_stat.obj \ ++ $(SLO)$/dbreg_util.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/dist/Makefile.in 2008-05-06 05:03:36.000000000 +0200 ++++ misc/build/db-4.7.25.NC/dist/Makefile.in 2009-07-21 11:39:25.000000000 +0200 +@@ -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/config.sub ++++ misc/build/db-4.7.25.NC/dist/config.sub +@@ -1272,7 +1272,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ +--- 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 @@ + # Set CFLAGS/CXXFLAGS. We MUST set the flags before we call autoconf + # compiler configuration macros, because if we don't, they set CFLAGS + # to no optimization and -g, which isn't what we want. +-CFLAGS=${CFLAGS-$optimize_debug} +-CXXFLAGS=${CXXFLAGS-"$CFLAGS"} ++#CFLAGS=${CFLAGS-$optimize_debug} ++#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 @@ + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. +- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in ++# case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in ++ case `$lt_cv_path_LD -v 2>&1 </dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break + ;; +@@ -36624,6 +36627,7 @@ + JAR!$JAR$ac_delim + JAVACFLAGS!$JAVACFLAGS$ac_delim + LDFLAGS!$LDFLAGS$ac_delim ++LDFLAGSVERSION!$LDFLAGSVERSION$ac_delim + LIBCSO_LIBS!$LIBCSO_LIBS$ac_delim + LIBJSO_LIBS!$LIBJSO_LIBS$ac_delim + LIBSO_LIBS!$LIBSO_LIBS$ac_delim +@@ -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 + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +--- misc/db-4.7.25.NC/dist/ltmain.sh 2006-06-27 03:03:33.000000000 +0200 ++++ misc/build/db-4.7.25.NC/dist/ltmain.sh 2009-07-21 11:39:25.000000000 +0200 +@@ -1700,7 +1700,9 @@ + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; +- *) ++ # or $ORIGIN altenatively ++ *\$ORIGIN*) ;; ++ *) + $echo "$modename: only absolute run-paths are allowed" 1>&2 + exit $EXIT_FAILURE + ;; +--- misc/db-4.7.25.NC/env/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/env/makefile.mk 2009-07-21 11:39:25.000000000 +0200 +@@ -1 +1,29 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=env ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/env_alloc.obj \ ++ $(SLO)$/env_config.obj \ ++ $(SLO)$/env_failchk.obj \ ++ $(SLO)$/env_file.obj \ ++ $(SLO)$/env_globals.obj \ ++ $(SLO)$/env_method.obj \ ++ $(SLO)$/env_name.obj \ ++ $(SLO)$/env_open.obj \ ++ $(SLO)$/env_recover.obj \ ++ $(SLO)$/env_region.obj \ ++ $(SLO)$/env_register.obj \ ++ $(SLO)$/env_sig.obj \ ++ $(SLO)$/env_stat.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/fileops/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/fileops/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,20 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=fileops ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/fileops_auto.obj \ ++ $(SLO)$/fop_basic.obj \ ++ $(SLO)$/fop_rec.obj \ ++ $(SLO)$/fop_util.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/hash/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/hash/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,30 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=hash ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/hash.obj \ ++ $(SLO)$/hash_auto.obj \ ++ $(SLO)$/hash_conv.obj \ ++ $(SLO)$/hash_dup.obj \ ++ $(SLO)$/hash_func.obj \ ++ $(SLO)$/hash_meta.obj \ ++ $(SLO)$/hash_method.obj \ ++ $(SLO)$/hash_open.obj \ ++ $(SLO)$/hash_page.obj \ ++ $(SLO)$/hash_rec.obj \ ++ $(SLO)$/hash_reclaim.obj \ ++ $(SLO)$/hash_stat.obj \ ++ $(SLO)$/hash_upgrade.obj \ ++ $(SLO)$/hash_verify.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/hmac/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/hmac/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,18 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=hmac ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/hmac.obj \ ++ $(SLO)$/sha1.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/hsearch/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/hsearch/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,16 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=hsearch ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= $(SLO)$/hsearch.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/lock/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/lock/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,26 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=lock ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/lock.obj \ ++ $(SLO)$/lock_deadlock.obj \ ++ $(SLO)$/lock_failchk.obj \ ++ $(SLO)$/lock_id.obj \ ++ $(SLO)$/lock_list.obj \ ++ $(SLO)$/lock_method.obj \ ++ $(SLO)$/lock_region.obj \ ++ $(SLO)$/lock_stat.obj \ ++ $(SLO)$/lock_timer.obj \ ++ $(SLO)$/lock_util.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/log/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/log/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,24 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=log ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/log.obj \ ++ $(SLO)$/log_archive.obj \ ++ $(SLO)$/log_compare.obj \ ++ $(SLO)$/log_debug.obj \ ++ $(SLO)$/log_get.obj \ ++ $(SLO)$/log_method.obj \ ++ $(SLO)$/log_put.obj \ ++ $(SLO)$/log_stat.obj ++ ++.INCLUDE : target.mk ++ +--- 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,76 @@ +-dummy ++PRJ=..$/..$/..$/.. ++PRJNAME=libdb47 ++TARGET=libdb47 ++USE_DEFFILE=true ++UWINAPILIB= ++ ++.INCLUDE : settings.mk ++CFLAGS+=-GS -EHsc -Gy ++ ++#LINKFLAGS!:=$(LINKFLAGS:s/NODEFAULTLIB/NOLOGO/) ++ ++CHILDREN= \ ++ btree clib common cxx \ ++ db dbm dbreg env fileops \ ++ hash hmac hsearch lock \ ++ log mp mutex os os_windows \ ++ qam rep repmgr sequence \ ++ txn xa ++ ++LIB1TARGET= $(SLB)$/$(TARGET).lib ++LIB1FILES= \ ++ $(SLB)$/btree.lib \ ++ $(SLB)$/clib.lib \ ++ $(SLB)$/common.lib \ ++ $(SLB)$/cxx.lib \ ++ $(SLB)$/db_src.lib \ ++ $(SLB)$/dbm.lib \ ++ $(SLB)$/dbreg.lib \ ++ $(SLB)$/env.lib \ ++ $(SLB)$/fileops.lib \ ++ $(SLB)$/hash.lib \ ++ $(SLB)$/hmac.lib \ ++ $(SLB)$/hsearch.lib \ ++ $(SLB)$/lock.lib \ ++ $(SLB)$/log.lib \ ++ $(SLB)$/mp.lib \ ++ $(SLB)$/mutex.lib \ ++ $(SLB)$/os.lib \ ++ $(SLB)$/os_windows.lib \ ++ $(SLB)$/qam.lib \ ++ $(SLB)$/rep.lib \ ++ $(SLB)$/repmgr.lib \ ++ $(SLB)$/sequence.lib \ ++ $(SLB)$/txn.lib \ ++ $(SLB)$/xa.lib ++ ++SHL1LIBS=$(LIB1TARGET) ++SHL1STDLIBS = $(WS2_32LIB) $(ADVAPI32LIB) ++SHL1TARGET = $(TARGET) ++SHL1DEF = $(MISC)$/$(SHL1TARGET).def ++SHL1IMPLIB = $(SHL1TARGET) ++SHL1LIBS = $(SLB)$/$(TARGET).lib ++SHL1DEPN = $(CHILDREN) ++ ++#The following line prevents that the resource file is automatically generated ++use_shl_versions:= ++#use the berkeley's resource file ++RCFILES = build_windows$/libdb.rc ++SHL1RES= $(RES)$/libdb47.res ++ ++#DEF1NAME=$(SHL1TARGET) ++#DEF1EXPORTFILE=$(TARGET).dxp ++ ++# dmake builds the first rule ++ALLTAR : $(CHILDREN) ++ ++$(CHILDREN) .PHONY : ++ cd $@ ; $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS) ++ ++.INCLUDE : target.mk ++ ++$(MISC)$/$(SHL1TARGET).def : build_windows$/libdb.def ++ $(COPY) $< $@ ++ ++ #$(DUMPBIN) -DIRECTIVES $(SLB)$/$(TARGET).lib | $(GREP) EXPORT: | $(GREP) -v ",DATA" | $(SED) "s/.*EXPORT://" >> $@ ++ +--- misc/db-4.7.25.NC/mp/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/mp/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,31 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=mp ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/mp_alloc.obj \ ++ $(SLO)$/mp_bh.obj \ ++ $(SLO)$/mp_fget.obj \ ++ $(SLO)$/mp_fmethod.obj \ ++ $(SLO)$/mp_fopen.obj \ ++ $(SLO)$/mp_fput.obj \ ++ $(SLO)$/mp_fset.obj \ ++ $(SLO)$/mp_method.obj \ ++ $(SLO)$/mp_mvcc.obj \ ++ $(SLO)$/mp_region.obj \ ++ $(SLO)$/mp_register.obj \ ++ $(SLO)$/mp_resize.obj \ ++ $(SLO)$/mp_stat.obj \ ++ $(SLO)$/mp_sync.obj \ ++ $(SLO)$/mp_trickle.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/mutex/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/mutex/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,23 @@ +-dummy ++ ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=mutex ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=-I..$/build_windows -I..$/ -I$(COMPATH)$/include $(PSDKINC) ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/mut_alloc.obj \ ++ $(SLO)$/mut_failchk.obj \ ++ $(SLO)$/mut_method.obj \ ++ $(SLO)$/mut_region.obj \ ++ $(SLO)$/mut_stat.obj \ ++ $(SLO)$/mut_win32.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/os/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/os/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,26 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=os ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/os_abort.obj \ ++ $(SLO)$/os_addrinfo.obj \ ++ $(SLO)$/os_alloc.obj \ ++ $(SLO)$/os_ctime.obj \ ++ $(SLO)$/os_pid.obj \ ++ $(SLO)$/os_root.obj \ ++ $(SLO)$/os_rpath.obj \ ++ $(SLO)$/os_stack.obj \ ++ $(SLO)$/os_tmpdir.obj \ ++ $(SLO)$/os_uid.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/os/os_fsync.c 2008-05-06 05:03:37.000000000 +0200 ++++ misc/build/db-4.7.25.NC/os/os_fsync.c 2009-07-21 11:42:03.000000000 +0200 +@@ -79,13 +79,17 @@ + ret = DB_GLOBAL(j_fsync)(fhp->fd); + else { + #if defined(F_FULLFSYNC) ++/* When running OOo on MacOS using an NFS mounted disk, fcntl failed with errno ++ ENOTTY (25). Since full sync only works on HFS, FAT and UDF (according to the ++ man page) and also is more time consuming we just use the fallback. + RETRY_CHK((fcntl(fhp->fd, F_FULLFSYNC, 0)), ret); +- /* ++*/ /* + * On OS X, F_FULLSYNC only works on HFS+, so we need to fall + * back to regular fsync on other filesystems. + */ +- if (ret == ENOTSUP) +- RETRY_CHK((fsync(fhp->fd)), ret); ++/* if (ret == ENOTSUP) ++*/ ++ RETRY_CHK((fsync(fhp->fd)), ret); + #elif defined(HAVE_QNX) + ret = __qnx_fsync(fhp); + #elif defined(HAVE_FDATASYNC) +--- misc/db-4.7.25.NC/os_windows/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/os_windows/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,37 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=os_windows ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/os_abs.obj \ ++ $(SLO)$/os_clock.obj \ ++ $(SLO)$/os_config.obj \ ++ $(SLO)$/os_cpu.obj \ ++ $(SLO)$/os_dir.obj \ ++ $(SLO)$/os_errno.obj \ ++ $(SLO)$/os_fid.obj \ ++ $(SLO)$/os_flock.obj \ ++ $(SLO)$/os_fsync.obj \ ++ $(SLO)$/os_getenv.obj \ ++ $(SLO)$/os_handle.obj \ ++ $(SLO)$/os_map.obj \ ++ $(SLO)$/os_mkdir.obj \ ++ $(SLO)$/os_open.obj \ ++ $(SLO)$/os_rename.obj \ ++ $(SLO)$/os_rw.obj \ ++ $(SLO)$/os_seek.obj \ ++ $(SLO)$/os_stat.obj \ ++ $(SLO)$/os_truncate.obj \ ++ $(SLO)$/os_unlink.obj \ ++ $(SLO)$/os_yield.obj \ ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/qam/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/qam/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,26 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=qam ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/qam.obj \ ++ $(SLO)$/qam_auto.obj \ ++ $(SLO)$/qam_conv.obj \ ++ $(SLO)$/qam_files.obj \ ++ $(SLO)$/qam_method.obj \ ++ $(SLO)$/qam_open.obj \ ++ $(SLO)$/qam_rec.obj \ ++ $(SLO)$/qam_stat.obj \ ++ $(SLO)$/qam_upgrade.obj \ ++ $(SLO)$/qam_verify.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/rep/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/rep/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,27 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=rep ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/rep_auto.obj \ ++ $(SLO)$/rep_backup.obj \ ++ $(SLO)$/rep_elect.obj \ ++ $(SLO)$/rep_lease.obj \ ++ $(SLO)$/rep_log.obj \ ++ $(SLO)$/rep_method.obj \ ++ $(SLO)$/rep_record.obj \ ++ $(SLO)$/rep_region.obj \ ++ $(SLO)$/rep_stat.obj \ ++ $(SLO)$/rep_util.obj \ ++ $(SLO)$/rep_verify.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/repmgr/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/repmgr/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,26 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=repmgr ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/repmgr_auto.obj \ ++ $(SLO)$/repmgr_elect.obj \ ++ $(SLO)$/repmgr_method.obj \ ++ $(SLO)$/repmgr_msg.obj \ ++ $(SLO)$/repmgr_net.obj \ ++ $(SLO)$/repmgr_queue.obj \ ++ $(SLO)$/repmgr_sel.obj \ ++ $(SLO)$/repmgr_stat.obj \ ++ $(SLO)$/repmgr_util.obj \ ++ $(SLO)$/repmgr_windows.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/sequence/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/sequence/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,18 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=sequence ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/seq_stat.obj \ ++ $(SLO)$/sequence.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/txn/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/txn/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,26 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=txn ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/txn.obj \ ++ $(SLO)$/txn_auto.obj \ ++ $(SLO)$/txn_chkpt.obj \ ++ $(SLO)$/txn_failchk.obj \ ++ $(SLO)$/txn_method.obj \ ++ $(SLO)$/txn_rec.obj \ ++ $(SLO)$/txn_recover.obj \ ++ $(SLO)$/txn_region.obj \ ++ $(SLO)$/txn_stat.obj \ ++ $(SLO)$/txn_util.obj ++ ++.INCLUDE : target.mk ++ +--- misc/db-4.7.25.NC/xa/makefile.mk 2009-07-21 11:42:40.000000000 +0200 ++++ misc/build/db-4.7.25.NC/xa/makefile.mk 2009-07-21 11:39:26.000000000 +0200 +@@ -1 +1,19 @@ +-dummy ++PRJ=..$/..$/..$/..$/.. ++ ++PRJNAME=berkeleydb ++TARGET=xa ++ ++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++ ++.INCLUDE : settings.mk ++ ++INCPRE+=..$/build_windows ..$/ ++CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS ++ ++SLOFILES= \ ++ $(SLO)$/xa.obj \ ++ $(SLO)$/xa_db.obj \ ++ $(SLO)$/xa_map.obj ++ ++.INCLUDE : target.mk ++ diff --git a/berkeleydb/db-aix.patch b/berkeleydb/db-aix.patch new file mode 100644 index 000000000000..3a2c21f1cf62 --- /dev/null +++ b/berkeleydb/db-aix.patch @@ -0,0 +1,205 @@ +--- misc/db-4.7.25.NC/dist/config.guess 2010-08-19 03:29:33.000000000 -0500 ++++ misc/build/db-4.7.25.NC/dist/config.guess 2010-08-19 03:32:57.000000000 -0500 +@@ -532,7 +532,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -544,6 +544,9 @@ + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi ++ if [ "$IBM_REV" == "V7BETA" ]; then ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) +--- misc/db-4.7.25.NC/dist/configure 2010-09-15 10:06:54.000000000 -0500 ++++ misc/build/db-4.7.25.NC/dist/configure 2010-09-15 10:12:41.000000000 -0500 +@@ -3701,7 +3701,7 @@ + # Don't override anything if it's already set from the environment. + optimize_debug="-O" + case "$host_os" in +-aix4.3.*|aix5*) ++aix[4-9]*) + case "$host_os" in + aix4.3.*) + CPPFLAGS="$CPPFLAGS -D_LINUX_SOURCE_COMPAT";; +@@ -6452,7 +6452,7 @@ + # whether `pass_all' will *always* work, you probably want this one. + + case $host_os in +-aix4* | aix5*) ++aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; + +@@ -9439,7 +9439,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[4-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no +@@ -9649,7 +9649,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -9669,7 +9669,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes +@@ -10410,7 +10410,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -11826,7 +11826,7 @@ + fi + ;; + +-aix4* | aix5*) ++aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -12670,7 +12670,7 @@ + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -12683,7 +12683,7 @@ + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix5*) ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) +@@ -13805,7 +13805,7 @@ + esac + else + case $host_os in +- aix4* | aix5*) ++ aix[4-9]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor +@@ -14201,7 +14201,7 @@ + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +- aix4* | aix5*) ++ aix[4-9]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +@@ -14334,7 +14334,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -15455,7 +15455,7 @@ + postinstall_cmds='$RANLIB $lib' + fi + ;; +-aix4* | aix5*) ++aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi +@@ -15966,7 +15966,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_F77=no +@@ -16176,7 +16176,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -16917,7 +16917,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -18540,7 +18540,7 @@ + + # See if GNU ld supports shared libraries. + case $host_os in +- aix3* | aix4* | aix5*) ++ aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_GCJ=no +@@ -18750,7 +18750,7 @@ + fi + ;; + +- aix4* | aix5*) ++ aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. +@@ -19511,7 +19511,7 @@ + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +-aix4* | aix5*) ++aix[4-9]*) + version_type=linux + need_lib_prefix=no + need_version=no +--- misc/db-4.7.25.NC/dist/configure.ac 2010-09-15 10:06:54.000000000 -0500 ++++ misc/build/db-4.7.25.NC/dist/configure.ac 2010-09-15 10:08:45.000000000 -0500 +@@ -154,7 +154,7 @@ + # Don't override anything if it's already set from the environment. + optimize_debug="-O" + case "$host_os" in +-aix4.3.*|aix5*) ++aix[4-9]*) + case "$host_os" in + aix4.3.*) + CPPFLAGS="$CPPFLAGS -D_LINUX_SOURCE_COMPAT";; diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk new file mode 100644 index 000000000000..376b1d93dfe9 --- /dev/null +++ b/berkeleydb/makefile.mk @@ -0,0 +1,187 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=. + +PRJNAME=so_berkeleydb +TARGET=so_berkeleydb + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +.IF "$(SYSTEM_DB)" == "YES" +all: + @echo "An already available installation of db should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." +.ENDIF + +# --- Files -------------------------------------------------------- + +TARFILE_NAME=db-4.7.25.NC-custom +TARFILE_MD5=d70951c80dabecc2892c919ff5d07172 +TARFILE_ROOTDIR=db-4.7.25.NC + +ADDITIONAL_FILES= \ + makefile.mk btree$/makefile.mk clib$/makefile.mk common$/makefile.mk \ + cxx$/makefile.mk db$/makefile.mk dbm$/makefile.mk dbreg$/makefile.mk \ + env$/makefile.mk fileops$/makefile.mk hash$/makefile.mk hmac$/makefile.mk \ + hsearch$/makefile.mk lock$/makefile.mk log$/makefile.mk mp$/makefile.mk \ + mutex$/makefile.mk os$/makefile.mk os_windows$/makefile.mk \ + qam$/makefile.mk rep$/makefile.mk repmgr$/makefile.mk \ + sequence$/makefile.mk txn$/makefile.mk xa$/makefile.mk \ + db_4_7_gcc4.map + +# not needed for win32. comment out when causing problems... +.IF "$(GUI)$(COM)"=="WNTGCC" +PATCH_FILES=db-4.7.25-mingw.patch +.ELSE +PATCH_FILES=\ + db-4.7.25.patch \ + db-aix.patch +.ENDIF + +# clean compiler flags +CFLAGS:= +CXXFLAGS:= + +# disable aliasing for all GCC platforms, at least GCC 4.x needs it if +# optimization level >= 2 +.IF "$(COM)"=="GCC" +CFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS) +CXXFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS) +.ENDIF + +.IF "$(GUI)"=="UNX" +.IF "$(OS)$(COM)"=="LINUXGCC" +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 +LDFLAGSVERSION:= -Wl,--version-script=../db_4_7_gcc4.map +.EXPORT: LDFLAGSVERSION +.ENDIF # "$(OS)$(COM)"=="LINUXGCC" +.IF "$(OS)$(COM)"=="SOLARISC52" +LDFLAGS:=$(ARCH_FLAGS) -R\''$$$$ORIGIN'\' +.EXPORT: LDFLAGS +.ENDIF # "$(OS)$(COM)"=="SOLARISC52" + +CONFIGURE_DIR=out +#relative to CONFIGURE_DIR +CONFIGURE_ACTION= \ + ..$/dist$/configure +CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-compat185 CC='$(CC) $(SOLARLIB)' +.IF "$(OS)"=="IOS" +CONFIGURE_FLAGS+= --disable-shared +.ELSE +CONFIGURE_FLAGS+= --enable-shared +.ENDIF +.IF "$(OS)"=="MACOSX" +CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" +.ENDIF +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + +# just pass ARCH_FLAGS to native build +CFLAGS+:=$(ARCH_FLAGS) +CXXFLAGS+:=$(ARCH_FLAGS) +.EXPORT : CFLAGS CXXFLAGS + +BUILD_DIR=$(CONFIGURE_DIR) +BUILD_DIR_OUT=$(CONFIGURE_DIR) +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) + +.IF "$(OS)"=="IOS" || "$(OS)" == "ANDROID" +OUT2LIB=$(BUILD_DIR)$/libdb*.a +.ELSE +OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) +.ENDIF +OUT2INC= \ + $(BUILD_DIR)$/db.h + +.ENDIF # "$(GUI)"=="UNX" + +.IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +CONFIGURE_DIR=out +#relative to CONFIGURE_DIR +# TODO needs clean up +CFLAGS+=-nostdinc +db_CC=$(CC) -mthreads +db_CXX=$(CXX) -mthreads +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +db_CC+=-shared-libgcc +db_CXX+=-shared-libgcc +.ENDIF +db_LDFLAGS=-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin +.IF "$(USE_MINGW)"=="cygwin" +db_LDFLAGS+=-L$(COMPATH)/lib/mingw -L$(COMPATH)/lib/w32api +.ENDIF +db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR) +db_LIBS= +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +CFLAGS+=-D_GLIBCXX_DLL +db_LIBS+=$(MINGW_SHARED_LIBSTDCPP) +.ENDIF +db_LIBXSO_LIBS=$(db_LIBS) +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +db_LIBXSO_LIBS+=-lgcc_s +.ENDIF +CONFIGURE_ACTION=..$/dist$/configure +CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)" + +BUILD_DIR=$(CONFIGURE_DIR) +BUILD_DIR_OUT=$(CONFIGURE_DIR) +BUILD_ACTION=make + +OUT2LIB=$(BUILD_DIR)$/.libs$/libdb47.dll.a +OUT2BIN=$(BUILD_DIR)$/.libs$/libdb47.dll + +OUT2INC= \ + $(BUILD_DIR)$/db.h +.IF "$(GUI)$(COM)"=="WNTGCC" +.EXPORT : PWD +.ENDIF + +.ELSE +BUILD_DIR= +BUILD_ACTION=dmake + +BUILD_DIR_OUT=build_windows +OUT2INC= \ + $(BUILD_DIR_OUT)$/db.h +.ENDIF +.ENDIF # "$(GUI)"=="WNT" + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk + + diff --git a/berkeleydb/prj/build.lst b/berkeleydb/prj/build.lst new file mode 100644 index 000000000000..55a7bf1a70a6 --- /dev/null +++ b/berkeleydb/prj/build.lst @@ -0,0 +1,3 @@ +db berkeleydb : external NULL +db berkeleydb nmake - u as_mkout NULL +db berkeleydb nmake - w,vc7 as_mkout NULL diff --git a/berkeleydb/prj/d.lst b/berkeleydb/prj/d.lst new file mode 100644 index 000000000000..1d50f617a1e6 --- /dev/null +++ b/berkeleydb/prj/d.lst @@ -0,0 +1,12 @@ +mkdir: %_DEST%\inc\berkeleydb + +..\%__SRC%\inc\db.h %_DEST%\inc\berkeleydb\db.h + +..\%__SRC%\lib\libdb47.lib %_DEST%\lib\libdb47.lib +..\%__SRC%\lib\libdb-4.7.a %_DEST%\lib\libdb-4.7.a +..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib\libdb-4.7.so +..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib\libdb-4.7.dylib +..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib\libdb-4.7.a +..\%__SRC%\bin\libdb47.dll %_DEST%\bin\libdb47.dll + + |