berkeleydb/db-4.7.25-mingw.patch

   1 --- misc/db-4.7.25.NC/dist/Makefile.in  2008-05-06 12:03:36.000000000 +0900
   2 +++ misc/build/db-4.7.25.NC/dist/Makefile.in    2009-07-11 13:38:07.419875000 +0900
   3 @@ -44,7 +44,7 @@
   4  SOLINK=                @MAKEFILE_SOLINK@ @CFLAGS@
   5  SOFLAGS=       @SOFLAGS@
   6  LIBMAJOR=      @DB_VERSION_MAJOR@
   7 -LIBVERSION=    @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
   8 +LIBVERSION=    @DB_VERSION_MAJOR@@DB_VERSION_MINOR@
   9
  10  CPPFLAGS=      -I$(builddir) -I$(srcdir) @CPPFLAGS@
  11
  12 @@ -62,18 +62,18 @@
  13
  14  libdb_base=    libdb
  15  libdb=         $(libdb_base).a
  16 -libdb_version= $(libdb_base)-$(LIBVERSION).a
  17 -libso=         $(libdb_base)-$(LIBVERSION)@SOSUFFIX@
  18 -libso_target=  $(libdb_base)-$(LIBVERSION).la
  19 +libdb_version= $(libdb_base)$(LIBVERSION).a
  20 +libso=         $(libdb_base)$(LIBVERSION)@SOSUFFIX@
  21 +libso_target=  $(libdb_base)$(LIBVERSION).la
  22  libso_default= $(libdb_base)@SOSUFFIX@
  23 -libso_major=   $(libdb_base)-$(LIBMAJOR)@SOSUFFIX@
  24 +libso_major=   $(libdb_base)$(LIBMAJOR)@SOSUFFIX@
  25
  26  ##################################################
  27  # C++ API.
  28  #
  29  # C++ support is optional, and can be built with static or shared libraries.
  30  ##################################################
  31 -CXXFLAGS=      -c $(CPPFLAGS) @CXXFLAGS@
  32 +CXXFLAGS=      -c $(SOLARINC) $(CPPFLAGS) -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) @CXXFLAGS@
  33  CXX=           @MAKEFILE_CXX@
  34  CXXLINK=       @MAKEFILE_CXXLINK@ @CXXFLAGS@
  35  XSOLINK=       @MAKEFILE_XSOLINK@ @CXXFLAGS@
  36 @@ -81,11 +81,11 @@
  37
  38  libcxx_base=   libdb_cxx
  39  libcxx=                $(libcxx_base).a
  40 -libcxx_version=        $(libcxx_base)-$(LIBVERSION).a
  41 -libxso=                $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
  42 -libxso_target= $(libcxx_base)-$(LIBVERSION).la
  43 +libcxx_version=        $(libcxx_base)$(LIBVERSION).a
  44 +libxso=                $(libcxx_base)$(LIBVERSION)@SOSUFFIX@
  45 +libxso_target= $(libcxx_base)$(LIBVERSION).la
  46  libxso_default=        $(libcxx_base)@SOSUFFIX@
  47 -libxso_major=  $(libcxx_base)-$(LIBMAJOR)@SOSUFFIX@
  48 +libxso_major=  $(libcxx_base)$(LIBMAJOR)@SOSUFFIX@
  49
  50  ##################################################
  51  # Java API.
  52 @@ -108,12 +108,12 @@
  53  libj_jarfile=  db.jar
  54  libj_exjarfile=        dbexamples.jar
  55  libjso_base=   libdb_java
  56 -libjso=                $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
  57 -libjso_static= $(libjso_base)-$(LIBVERSION).a
  58 -libjso_target= $(libjso_base)-$(LIBVERSION).la
  59 +libjso=                $(libjso_base)$(LIBVERSION)@JMODSUFFIX@
  60 +libjso_static= $(libjso_base)$(LIBVERSION).a
  61 +libjso_target= $(libjso_base)$(LIBVERSION).la
  62  libjso_default=        $(libjso_base)@JMODSUFFIX@
  63 -libjso_major=  $(libjso_base)-$(LIBMAJOR)@JMODSUFFIX@
  64 -libjso_g=      $(libjso_base)-$(LIBVERSION)_g@JMODSUFFIX@
  65 +libjso_major=  $(libjso_base)$(LIBMAJOR)@JMODSUFFIX@
  66 +libjso_g=      $(libjso_base)$(LIBVERSION)_g@JMODSUFFIX@
  67
  68  ##################################################
  69  # TCL API.
  70 @@ -123,11 +123,11 @@
  71  TCL_INCLUDE_SPEC=      @TCL_INCLUDE_SPEC@
  72  LIBTSO_LIBS=   @LIBTSO_LIBS@ @LIBSO_LIBS@
  73  libtso_base=   libdb_tcl
  74 -libtso=                $(libtso_base)-$(LIBVERSION)@MODSUFFIX@
  75 -libtso_static= $(libtso_base)-$(LIBVERSION).a
  76 -libtso_target= $(libtso_base)-$(LIBVERSION).la
  77 +libtso=                $(libtso_base)$(LIBVERSION)@MODSUFFIX@
  78 +libtso_static= $(libtso_base)$(LIBVERSION).a
  79 +libtso_target= $(libtso_base)$(LIBVERSION).la
  80  libtso_default=        $(libtso_base)@MODSUFFIX@
  81 -libtso_major=  $(libtso_base)-$(LIBMAJOR)@MODSUFFIX@
  82 +libtso_major=  $(libtso_base)$(LIBMAJOR)@MODSUFFIX@
  83
  84  ##################################################
  85  # db_dump185 UTILITY
  86 @@ -756,7 +756,7 @@
  87
  88  # Shared Java library.
  89  $(libjso_target): $(JAVA_OBJS) $(C_OBJS)
  90 -       $(SOLINK) -shrext @JMODSUFFIX@ $(SOFLAGS) $(LDFLAGS) \
  91 +       $(SOLINK) -shrext @JMODSUFFIX@ -add-underscore $(SOFLAGS) $(LDFLAGS) \
  92             -o $@ $(JAVA_OBJS) $(C_OBJS) $(LIBJSO_LIBS)
  93
  94  # Shared Tcl library.
  95 --- misc/db-4.7.25.NC/dist/configure    2008-05-16 06:12:41.000000000 +0900
  96 +++ misc/build/db-4.7.25.NC/dist/configure      2009-07-11 16:00:39.255625000 +0900
  97 @@ -9488,7 +9488,7 @@
  98        export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
  99
 100        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 101 -        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 102 +        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'
 103         # If the export-symbols file already is a .def file (1st line
 104         # is EXPORTS), use it as is; otherwise, prepend...
 105         archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
 106 @@ -9497,7 +9497,7 @@
 107           echo EXPORTS > $output_objdir/$soname.def;
 108           cat $export_symbols >> $output_objdir/$soname.def;
 109         fi~
 110 -       $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 111 +       $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'
 112        else
 113         ld_shlibs=no
 114        fi
 115 @@ -13680,15 +13680,15 @@
 116
 117         if test "$pre_test_object_deps_done" = no; then
 118          if test -z "$predep_objects_CXX"; then
 119 -          predep_objects_CXX="$p"
 120 +          predep_objects_CXX=`cygpath -m "$p"`
 121          else
 122 -          predep_objects_CXX="$predep_objects_CXX $p"
 123 +          predep_objects_CXX="$predep_objects_CXX "`cygpath -m "$p"`
 124          fi
 125         else
 126          if test -z "$postdep_objects_CXX"; then
 127 -          postdep_objects_CXX="$p"
 128 +          postdep_objects_CXX=`cygpath -m "$p"`
 129          else
 130 -          postdep_objects_CXX="$postdep_objects_CXX $p"
 131 +          postdep_objects_CXX="$postdep_objects_CXX "`cygpath -m "$p"`
 132          fi
 133         fi
 134         ;;
 135 @@ -27697,6 +27697,18 @@
 136
 137
 138
 139 +ac_cv_sizeof_char_p=`echo $ac_cv_sizeof_char_p | tr -d '\015'`
 140 +ac_cv_sizeof_unsigned_int=`echo $ac_cv_sizeof_unsigned_int | tr -d '\015'`
 141 +ac_cv_sizeof_unsigned_char=`echo $ac_cv_sizeof_unsigned_char | tr -d '\015'`
 142 +ac_cv_sizeof_unsigned_short=`echo $ac_cv_sizeof_unsigned_short | tr -d '\015'`
 143 +ac_cv_sizeof_unsigned_long=`echo $ac_cv_sizeof_unsigned_long | tr -d '\015'`
 144 +ac_cv_sizeof_unsigned_long_long=`echo $ac_cv_sizeof_unsigned_long_long | tr -d '\015'`
 145 +ac_cv_sizeof_int=`echo $ac_cv_sizeof_int | tr -d '\015'`
 146 +ac_cv_sizeof_char=`echo $ac_cv_sizeof_char | tr -d '\015'`
 147 +ac_cv_sizeof_short=`echo $ac_cv_sizeof_short | tr -d '\015'`
 148 +ac_cv_sizeof_long=`echo $ac_cv_sizeof_long | tr -d '\015'`
 149 +ac_cv_sizeof_long_long=`echo $ac_cv_sizeof_long_long | tr -d '\015'`
 150 +
 151  # We look for u_char, u_short, u_int, u_long -- if we can't find them,
 152  # we create our own.
 153
 154 --- misc/db-4.7.25.NC/dist/ltmain.sh    2006-06-27 10:03:33.000000000 +0900
 155 +++ misc/build/db-4.7.25.NC/dist/ltmain.sh      2009-07-11 13:38:07.388625000 +0900
 156 @@ -1103,6 +1103,7 @@
 157      lib_search_path=`pwd`
 158      inst_prefix_dir=
 159
 160 +    add_underscore=
 161      avoid_version=no
 162      dlfiles=
 163      dlprefiles=
 164 @@ -1435,6 +1436,11 @@
 165        prevarg="$arg"
 166
 167        case $arg in
 168 +      -add-underscore)
 169 +       add_underscore="--add-underscore"
 170 +       continue
 171 +       ;;
 172 +
 173        -all-static)
 174         if test -n "$link_static_flag"; then
 175           compile_command="$compile_command $link_static_flag"
 176 @@ -4869,7 +4875,7 @@
 177         esac
 178         # test for cygwin because mv fails w/o .exe extensions
 179         case $host in
 180 -         *cygwin*)
 181 +         *cygwin* | *mingw*)
 182             exeext=.exe
 183             outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
 184           *) exeext= ;;