berkeleydb/db-4.2.52-mingw.patch

   1 *** misc/db-4.2.52.NC/dist/configure    2003-12-04 06:10:02.000000000 +0900
   2 --- misc/build/db-4.2.52.NC/dist/configure      Thu Dec 20 23:08:25 2007
   3 ***************
   4 *** 8301,8307 ****
   5         export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
   6
   7         if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
   8 !         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
   9         # If the export-symbols file already is a .def file (1st line
  10         # is EXPORTS), use it as is; otherwise, prepend...
  11         archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  12 --- 8301,8307 ----
  13         export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
  14
  15         if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
  16 !         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}--image-base=0x10000000'
  17         # If the export-symbols file already is a .def file (1st line
  18         # is EXPORTS), use it as is; otherwise, prepend...
  19         archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  20 ***************
  21 *** 8310,8316 ****
  22           echo EXPORTS > $output_objdir/$soname.def;
  23           cat $export_symbols >> $output_objdir/$soname.def;
  24         fi~
  25 !       $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
  26         else
  27         ld_shlibs=no
  28         fi
  29 --- 8310,8316 ----
  30           echo EXPORTS > $output_objdir/$soname.def;
  31           cat $export_symbols >> $output_objdir/$soname.def;
  32         fi~
  33 !       $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}--image-base=0x10000000'
  34         else
  35         ld_shlibs=no
  36         fi
  37 ***************
  38 *** 12077,12091 ****
  39
  40          if test "$pre_test_object_deps_done" = no; then
  41          if test -z "$predep_objects_CXX"; then
  42 !          predep_objects_CXX="$p"
  43          else
  44 !          predep_objects_CXX="$predep_objects_CXX $p"
  45          fi
  46          else
  47          if test -z "$postdep_objects_CXX"; then
  48 !          postdep_objects_CXX="$p"
  49          else
  50 !          postdep_objects_CXX="$postdep_objects_CXX $p"
  51          fi
  52          fi
  53          ;;
  54 --- 12077,12091 ----
  55
  56          if test "$pre_test_object_deps_done" = no; then
  57          if test -z "$predep_objects_CXX"; then
  58 !          predep_objects_CXX=`cygpath -m "$p"`
  59          else
  60 !          predep_objects_CXX="$predep_objects_CXX "`cygpath -m "$p"`
  61          fi
  62          else
  63          if test -z "$postdep_objects_CXX"; then
  64 !          postdep_objects_CXX=`cygpath -m "$p"`
  65          else
  66 !          postdep_objects_CXX="$postdep_objects_CXX "`cygpath -m "$p"`
  67          fi
  68          fi
  69          ;;
  70 ***************
  71 *** 26252,26257 ****
  72 --- 26252,26268 ----
  73
  74
  75
  76 + ac_cv_sizeof_char_p=`echo $ac_cv_sizeof_char_p | tr -d '\015'`
  77 + ac_cv_sizeof_unsigned_int=`echo $ac_cv_sizeof_unsigned_int | tr -d '\015'`
  78 + ac_cv_sizeof_unsigned_char=`echo $ac_cv_sizeof_unsigned_char | tr -d '\015'`
  79 + ac_cv_sizeof_unsigned_short=`echo $ac_cv_sizeof_unsigned_short | tr -d '\015'`
  80 + ac_cv_sizeof_unsigned_long=`echo $ac_cv_sizeof_unsigned_long | tr -d '\015'`
  81 + ac_cv_sizeof_size_t=`echo $ac_cv_sizeof_size_t | tr -d '\015'`
  82 + ac_cv_sizeof_int=`echo $ac_cv_sizeof_int | tr -d '\015'`
  83 + ac_cv_sizeof_char=`echo $ac_cv_sizeof_char | tr -d '\015'`
  84 + ac_cv_sizeof_short=`echo $ac_cv_sizeof_short | tr -d '\015'`
  85 + ac_cv_sizeof_long=`echo $ac_cv_sizeof_long | tr -d '\015'`
  86 +
  87   echo "$as_me:$LINENO: checking for u_int8_t" >&5
  88   echo $ECHO_N "checking for u_int8_t... $ECHO_C" >&6
  89   if test "${ac_cv_type_u_int8_t+set}" = set; then
  90 --- misc/build/db-4.2.52.NC/dist/ltmain.sh.orig 2003-04-27 02:45:38.000000000 +0900
  91 +++ misc/build/db-4.2.52.NC/dist/ltmain.sh      2005-04-08 00:03:16.000000000 +0900
  92 @@ -853,6 +853,7 @@
  93      lib_search_path=`pwd`
  94      inst_prefix_dir=
  95
  96 +    add_underscore=
  97      avoid_version=no
  98      dlfiles=
  99      dlprefiles=
 100 @@ -1159,6 +1160,11 @@
 101        prevarg="$arg"
 102
 103        case $arg in
 104 +      -add-underscore)
 105 +       add_underscore="--add-underscore"
 106 +       continue
 107 +       ;;
 108 +
 109        -all-static)
 110         if test -n "$link_static_flag"; then
 111           compile_command="$compile_command $link_static_flag"
 112 @@ -4474,7 +4480,7 @@
 113         esac
 114         # test for cygwin because mv fails w/o .exe extensions
 115         case $host in
 116 -         *cygwin*)
 117 +         *cygwin* | *mingw*)
 118             exeext=.exe
 119             outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
 120           *) exeext= ;;
 121 --- misc/build/db-4.2.52.NC/dist/Makefile.in.orig       2003-11-29 03:50:06.000000000 +0900
 122 +++ misc/build/db-4.2.52.NC/dist/Makefile.in    2005-04-03 13:51:34.000000000 +0900
 123 @@ -45,7 +45,7 @@
 124  SOLINK=                @MAKEFILE_SOLINK@
 125  SOFLAGS=       @SOFLAGS@
 126  LIBMAJOR=      @DB_VERSION_MAJOR@
 127 -LIBVERSION=    @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
 128 +LIBVERSION=    @DB_VERSION_MAJOR@@DB_VERSION_MINOR@
 129
 130  CPPFLAGS=      -I$(builddir) -I$(srcdir) @CPPFLAGS@
 131
 132 @@ -62,18 +62,18 @@
 133
 134  libdb_base=    libdb
 135  libdb=         $(libdb_base).a
 136 -libdb_version= $(libdb_base)-$(LIBVERSION).a
 137 -libso=         $(libdb_base)-$(LIBVERSION)@SOSUFFIX@
 138 -libso_target=  $(libdb_base)-$(LIBVERSION).la
 139 +libdb_version= $(libdb_base)$(LIBVERSION).a
 140 +libso=         $(libdb_base)$(LIBVERSION)@SOSUFFIX@
 141 +libso_target=  $(libdb_base)$(LIBVERSION).la
 142  libso_default= $(libdb_base)@SOSUFFIX@
 143 -libso_major=   $(libdb_base)-$(LIBMAJOR)@SOSUFFIX@
 144 +libso_major=   $(libdb_base)$(LIBMAJOR)@SOSUFFIX@
 145
 146  ##################################################
 147  # C++ API.
 148  #
 149  # C++ support is optional, and can be built with static or shared libraries.
 150  ##################################################
 151 -CXXFLAGS=      -c $(CPPFLAGS) @CXXFLAGS@
 152 +CXXFLAGS=      -c $(SOLARINC) $(CPPFLAGS) -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) @CXXFLAGS@
 153  CXX=           @MAKEFILE_CXX@
 154  CXXLINK=       @MAKEFILE_CXXLINK@
 155  XSOLINK=       @MAKEFILE_XSOLINK@
 156 @@ -81,11 +81,11 @@
 157
 158  libcxx_base=   libdb_cxx
 159  libcxx=                $(libcxx_base).a
 160 -libcxx_version=        $(libcxx_base)-$(LIBVERSION).a
 161 -libxso=                $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
 162 -libxso_target= $(libcxx_base)-$(LIBVERSION).la
 163 +libcxx_version=        $(libcxx_base)$(LIBVERSION).a
 164 +libxso=                $(libcxx_base)$(LIBVERSION)@SOSUFFIX@
 165 +libxso_target= $(libcxx_base)$(LIBVERSION).la
 166  libxso_default=        $(libcxx_base)@SOSUFFIX@
 167 -libxso_major=  $(libcxx_base)-$(LIBMAJOR)@SOSUFFIX@
 168 +libxso_major=  $(libcxx_base)$(LIBMAJOR)@SOSUFFIX@
 169
 170  ##################################################
 171  # Java API.
 172 @@ -112,12 +112,12 @@
 173  libj_exjarfile=        dbexamples.jar
 174  rpc_jarfile=   dbsvc.jar
 175  libjso_base=   libdb_java
 176 -libjso=                $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
 177 -libjso_static= $(libjso_base)-$(LIBVERSION).a
 178 -libjso_target= $(libjso_base)-$(LIBVERSION).la
 179 +libjso=                $(libjso_base)$(LIBVERSION)@JMODSUFFIX@
 180 +libjso_static= $(libjso_base)$(LIBVERSION).a
 181 +libjso_target= $(libjso_base)$(LIBVERSION).la
 182  libjso_default=        $(libjso_base)@JMODSUFFIX@
 183 -libjso_major=  $(libjso_base)-$(LIBMAJOR)@JMODSUFFIX@
 184 -libjso_g=      $(libjso_base)-$(LIBVERSION)_g@JMODSUFFIX@
 185 +libjso_major=  $(libjso_base)$(LIBMAJOR)@JMODSUFFIX@
 186 +libjso_g=      $(libjso_base)$(LIBVERSION)_g@JMODSUFFIX@
 187
 188  ##################################################
 189  # TCL API.
 190 @@ -127,11 +127,11 @@
 191  TCFLAGS=       @TCFLAGS@
 192  LIBTSO_LIBS=   @LIBTSO_LIBS@
 193  libtso_base=   libdb_tcl
 194 -libtso=                $(libtso_base)-$(LIBVERSION)@MODSUFFIX@
 195 -libtso_static= $(libtso_base)-$(LIBVERSION).a
 196 -libtso_target= $(libtso_base)-$(LIBVERSION).la
 197 +libtso=                $(libtso_base)$(LIBVERSION)@MODSUFFIX@
 198 +libtso_static= $(libtso_base)$(LIBVERSION).a
 199 +libtso_target= $(libtso_base)$(LIBVERSION).la
 200  libtso_default=        $(libtso_base)@MODSUFFIX@
 201 -libtso_major=  $(libtso_base)-$(LIBMAJOR)@MODSUFFIX@
 202 +libtso_major=  $(libtso_base)$(LIBMAJOR)@MODSUFFIX@
 203
 204  ##################################################
 205  # db_dump185 UTILITY
 206 @@ -666,7 +666,7 @@
 207
 208  # Shared Java library.
 209  $(libjso_target): $(JAVA_OBJS) $(C_OBJS)
 210 -       $(SOLINK) -shrext @JMODSUFFIX@ $(SOFLAGS) $(LDFLAGS) \
 211 +       $(SOLINK) -shrext @JMODSUFFIX@ -add-underscore $(SOFLAGS) $(LDFLAGS) \
 212             -o $@ $(JAVA_OBJS) $(C_OBJS) $(LIBJSO_LIBS)
 213
 214  # Shared Tcl library.
 215 *** misc/build/db-4.2.52.NC/btree/bt_put.c.orig 2003-11-17 19:58:20.000000000 +0000
 216 --- misc/build/db-4.2.52.NC/btree/bt_put.c      2007-06-17 15:05:09.000000000 +0100
 217 ***************
 218 *** 702,708 ****
 219
 220         /* Sum up all the data items. */
 221         for (cnt = 0, first = indx;
 222 !           inp[first] == inp[indx] && indx < NUM_ENT(h);
 223             ++cnt, indx += P_INDX) {
 224                 bk = GET_BKEYDATA(dbp, h, indx + O_INDX);
 225                 sz += B_TYPE(bk->type) == B_KEYDATA ?
 226 --- 702,708 ----
 227
 228         /* Sum up all the data items. */
 229         for (cnt = 0, first = indx;
 230 !           indx < NUM_ENT(h) && inp[first] == inp[indx];
 231             ++cnt, indx += P_INDX) {
 232                 bk = GET_BKEYDATA(dbp, h, indx + O_INDX);
 233                 sz += B_TYPE(bk->type) == B_KEYDATA ?