diff options
Diffstat (limited to 'berkeleydb/db-4.7.25-mingw.patch')
| -rw-r--r-- | berkeleydb/db-4.7.25-mingw.patch | 184 |
1 files changed, 184 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..cd1cf3a1d41d --- /dev/null +++ b/berkeleydb/db-4.7.25-mingw.patch @@ -0,0 +1,184 @@ +--- 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 + ;; +@@ -27697,6 +27697,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= ;; |