Merge pull request #3004 from lazka/db-rebuild

db: drop msysize patch
2022-05-14 20:59:06 +02:00 · 2022-05-14 20:59:06 +02:00 · 9c8f01cc5a
commit 9c8f01cc5a
parent 955aef8003 ff09dfefd9
2 changed files with 5 additions and 688 deletions
--- a/db/PKGBUILD
+++ b/db/PKGBUILD
@ -14,15 +14,13 @@ source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz
        5.3-java.patch
        5.3-tcl.patch
        5.3-vpath.patch
-        https://src.fedoraproject.org/rpms/libdb/raw/d6841b3b46a51db98c162347211a5a64d154ea37/f/db-5.3.28-atomic_compare_exchange.patch
-        db-5.3.28-msys2.patch)
+        https://src.fedoraproject.org/rpms/libdb/raw/d6841b3b46a51db98c162347211a5a64d154ea37/f/db-5.3.28-atomic_compare_exchange.patch)
 options=('!makeflags')
 sha256sums=('e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628'
            'a925b88e58cff6d4aeed3eecfa2cf4c606f2ed469607d8fd0c5c0a9c4b5a8bd1'
            '2166bac574f60d42fe6dd6c03223d6595accf303375be397e277b38676b8cb08'
            '7614933d2770c2aa6864cd731c114b90a4e4c1a8a988daabd9b6f203ab8f1f21'
-            'eb58b5764e16c6f81df8ff80964ef2e071ca5cbb9e24d37f45a831107afb68cc'
-            '42ae2995fefbd06853278db1620e8a15dbfd580e1a26c7f26e6d81e734e064cd')
+            'eb58b5764e16c6f81df8ff80964ef2e071ca5cbb9e24d37f45a831107afb68cc')

 prepare() {
  cd "${srcdir}/${pkgname}-${pkgver}"
@ -31,7 +29,6 @@ prepare() {
  patch -Np2 -i ${srcdir}/5.3-tcl.patch
  patch -Np2 -i ${srcdir}/5.3-vpath.patch
  patch -Np1 -i ${srcdir}/db-5.3.28-atomic_compare_exchange.patch
-  patch -Np1 -i ${srcdir}/db-5.3.28-msys2.patch

  cd dist
  ac_macrodir=aclocal libtoolize --copy --force --install
@ -40,8 +37,11 @@ prepare() {

 build() {
  cd "${srcdir}"/$pkgname-${pkgver}/build_unix
+
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
  ../dist/configure \
    --prefix=/usr \
+    --build=${CYGWIN_CHOST} \
    --enable-compat185 \
    --enable-shared \
    --enable-static \
--- a/db/db-5.3.28-msys2.patch
+++ b/db/db-5.3.28-msys2.patch
@ -1,683 +0,0 @@
-diff -Naur db-5.3.28-orig/dist/config.guess db-5.3.28/dist/config.guess
--- db-5.3.28-orig/dist/config.guess	2013-09-09 19:35:02.000000000 +0400
-+++ db-5.3.28/dist/config.guess	2014-06-29 13:57:16.109600000 +0400
-@@ -846,6 +846,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;
-diff -Naur db-5.3.28-orig/dist/configure.ac db-5.3.28/dist/configure.ac
--- db-5.3.28-orig/dist/configure.ac	2013-09-09 19:35:02.000000000 +0400
-+++ db-5.3.28/dist/configure.ac	2014-06-29 13:57:55.811600000 +0400
-@@ -194,7 +194,7 @@
- 	LDFLAGS="$LDFLAGS -Wl,-brtl";;
- bsdi3*)	CC=${CC-"shlicc2"}
- 	LIBSO_LIBS="$LIBSO_LIBS -lipc";;
-cygwin*)
-+cygwin* | msys*)
- 	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";;
- freebsd*)
- 	CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-@@ -375,7 +375,7 @@
- 
- 
- case "$host_os" in
-cygwin* | mingw*)
-+cygwin* | msys* | mingw*)
- 	MAKEFILE_SOLINK="$MAKEFILE_SOLINK -no-undefined"
- 	MAKEFILE_XSOLINK="$MAKEFILE_XSOLINK -no-undefined";;
- esac
-diff -Naur db-5.3.28-orig/lang/perl/BerkeleyDB/t/util.pm db-5.3.28/lang/perl/BerkeleyDB/t/util.pm
--- db-5.3.28-orig/lang/perl/BerkeleyDB/t/util.pm	2013-09-09 19:35:04.000000000 +0400
-+++ db-5.3.28/lang/perl/BerkeleyDB/t/util.pm	2014-06-29 13:59:46.275200000 +0400
-@@ -134,7 +134,7 @@
- {
-     my $data = shift ;
-     $data =~ s#\r\n#\n#g
-        if $^O eq 'cygwin' ;
-+        if ($^O eq 'cygwin' || $^O eq 'msys') ;
- 
-     return $data ;
- }
-diff -Naur db-5.3.28-orig/lang/perl/DB_File/t/db-btree.t db-5.3.28/lang/perl/DB_File/t/db-btree.t
--- db-5.3.28-orig/lang/perl/DB_File/t/db-btree.t	2013-09-09 19:35:04.000000000 +0400
-+++ db-5.3.28/lang/perl/DB_File/t/db-btree.t	2014-06-29 14:00:12.077600000 +0400
-@@ -105,7 +105,7 @@
- {
-     my $data = shift ;
-     $data =~ s#\r\n#\n#g 
-        if $^O eq 'cygwin' ;
-+        if ($^O eq 'cygwin' || $^O eq 'msys') ;
- 
-     return $data ;
- }
-@@ -175,7 +175,7 @@
- my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
-    $blksize,$blocks) = stat($Dfile);
- 
-my %noMode = map { $_, 1} qw( amigaos MSWin32 NetWare cygwin ) ;
-+my %noMode = map { $_, 1} qw( amigaos MSWin32 NetWare cygwin msys ) ;
- 
- ok(18, ($mode & 0777) == (($^O eq 'os2' || $^O eq 'MacOS') ? 0666 : 0640)
-    || $noMode{$^O} );
-diff -Naur db-5.3.28-orig/lang/perl/DB_File/t/db-hash.t db-5.3.28/lang/perl/DB_File/t/db-hash.t
--- db-5.3.28-orig/lang/perl/DB_File/t/db-hash.t	2013-09-09 19:35:04.000000000 +0400
-+++ db-5.3.28/lang/perl/DB_File/t/db-hash.t	2014-06-29 13:59:00.941600000 +0400
-@@ -69,7 +69,7 @@
- {
-     my $data = shift ;
-     $data =~ s#\r\n#\n#g 
-        if $^O eq 'cygwin' ;
-+        if ($^O eq 'cygwin' || $^O eq 'msys') ;
-     return $data ;
- }
- 
-@@ -137,7 +137,7 @@
- my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
-    $blksize,$blocks) = stat($Dfile);
- 
-my %noMode = map { $_, 1} qw( amigaos MSWin32 NetWare cygwin ) ;
-+my %noMode = map { $_, 1} qw( amigaos MSWin32 NetWare cygwin msys ) ;
- 
- ok(16, ($mode & 0777) == (($^O eq 'os2' || $^O eq 'MacOS') ? 0666 : 0640) ||
-    $noMode{$^O} );
-diff -Naur db-5.3.28-orig/lang/perl/DB_File/t/db-recno.t db-5.3.28/lang/perl/DB_File/t/db-recno.t
--- db-5.3.28-orig/lang/perl/DB_File/t/db-recno.t	2013-09-09 19:35:04.000000000 +0400
-+++ db-5.3.28/lang/perl/DB_File/t/db-recno.t	2014-06-29 14:00:50.656400000 +0400
-@@ -125,7 +125,7 @@
- 
- sub normalise
- {
-    return unless $^O eq 'cygwin' ;
-+    return unless ($^O eq 'cygwin' || $^O eq 'msys') ;
-     foreach (@_)
-       { s#\r\n#\n#g }     
- }
-@@ -197,7 +197,7 @@
- my @h ;
- ok(17, $X = tie @h, 'DB_File', $Dfile, O_RDWR|O_CREAT, 0640, $DB_RECNO ) ;
- 
-my %noMode = map { $_, 1} qw( amigaos MSWin32 NetWare cygwin ) ;
-+my %noMode = map { $_, 1} qw( amigaos MSWin32 NetWare cygwin msys ) ;
- 
- ok(18, ((stat($Dfile))[2] & 0777) == (($^O eq 'os2' || $^O eq 'MacOS') ? 0666 : 0640)
- 	||  $noMode{$^O} );
-diff -Naur db-5.3.28-orig/lang/sql/jdbc/aclocal.m4 db-5.3.28/lang/sql/jdbc/aclocal.m4
--- db-5.3.28-orig/lang/sql/jdbc/aclocal.m4	2011-10-27 17:21:17.000000000 +0400
-+++ db-5.3.28/lang/sql/jdbc/aclocal.m4	2014-06-29 14:03:30.306800000 +0400
-@@ -1523,7 +1523,7 @@
-     lt_cv_sys_max_cmd_len=-1;
-     ;;
- 
-  cygwin* | mingw* | cegcc*)
-+  cygwin* | msys* | mingw* | cegcc*)
-     # On Win9x/ME, this test blows up -- it succeeds, but takes
-     # about 5 minutes as the teststring grows exponentially.
-     # Worse, since 9x/ME are not pre-emptively multitasking,
-@@ -1750,7 +1750,7 @@
-     lt_cv_dlopen_libs=
-     ;;
- 
-  cygwin*)
-+  cygwin* | msys*)
-     lt_cv_dlopen="dlopen"
-     lt_cv_dlopen_libs=
-     ;;
-@@ -2207,14 +2207,14 @@
-   # libtool to hard-code these into programs
-   ;;
- 
-cygwin* | mingw* | pw32* | cegcc*)
-+cygwin* | msys* | mingw* | pw32* | cegcc*)
-   version_type=windows
-   shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
- 
-   case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
-     library_names_spec='$libname.dll.a'
-     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
-@@ -2237,6 +2237,11 @@
-       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
-+    msys*)
-+      # MSYS DLLs use 'msys-' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-     mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-@@ -2999,7 +3004,7 @@
-   lt_cv_file_magic_test_file=/shlib/libc.so
-   ;;
- 
-cygwin*)
-+cygwin* | msys*)
-   # func_win32_libid is a shell function defined in ltmain.sh
-   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-   lt_cv_file_magic_cmd='func_win32_libid'
-@@ -3266,7 +3271,7 @@
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- LIBM=
- case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+*-*-beos* | *-*-cygwin* |*-*-msys* | *-*-pw32* | *-*-darwin*)
-   # These system don't have libm, or don't need it
-   ;;
- *-ncr-sysv4.3*)
-@@ -3335,7 +3340,7 @@
- aix*)
-   symcode='[[BCDT]]'
-   ;;
-cygwin* | mingw* | pw32* | cegcc*)
-+cygwin* | msys* | mingw* | pw32* | cegcc*)
-   symcode='[[ABCDGISTW]]'
-   ;;
- hpux*)
-@@ -3581,7 +3586,7 @@
-     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-       # PIC is the default for these OSes.
-       ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-+    mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -3888,7 +3893,7 @@
-       # PIC is the default for these OSes.
-       ;;
- 
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -3958,7 +3963,7 @@
-       fi
-       ;;
- 
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       m4_if([$1], [GCJ], [],
-@@ -4189,7 +4194,7 @@
-   pw32*)
-     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-   ;;
-  cygwin* | mingw* | cegcc*)
-+  cygwin* | msys* | mingw* | cegcc*)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   *)
-@@ -4241,7 +4246,7 @@
-   extract_expsyms_cmds=
- 
-   case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -4328,7 +4333,7 @@
-       fi
-       ;;
- 
-    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-       # as there is no search path for DLLs.
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-@@ -4683,7 +4688,7 @@
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-       ;;
- 
-    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # When not using gcc, we currently assume that we are using
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -5627,7 +5632,7 @@
-         esac
-         ;;
- 
-      cygwin* | mingw* | pw32* | cegcc*)
-+      cygwin* | msys* | mingw* | pw32* | cegcc*)
-         # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-         # as there is no search path for DLLs.
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-@@ -7480,7 +7485,7 @@
- [enable_win32_dll=yes
- 
- case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-   AC_CHECK_TOOL(AS, as, false)
-   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-diff -Naur db-5.3.28-orig/lang/sql/jdbc/config.guess db-5.3.28/lang/sql/jdbc/config.guess
--- db-5.3.28-orig/lang/sql/jdbc/config.guess	2010-08-24 23:42:47.000000000 +0400
-+++ db-5.3.28/lang/sql/jdbc/config.guess	2014-06-29 14:04:20.139000000 +0400
-@@ -800,6 +800,10 @@
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit ;;
-+	exit ;;
-+    i*:MSYS*:*)
-+	echo ${UNAME_MACHINE}-pc-msys
-+	exit ;;
-     *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit ;;
-@@ -840,6 +844,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;
-diff -Naur db-5.3.28-orig/lang/sql/jdbc/config.sub db-5.3.28/lang/sql/jdbc/config.sub
--- db-5.3.28-orig/lang/sql/jdbc/config.sub	2010-08-24 23:42:47.000000000 +0400
-+++ db-5.3.28/lang/sql/jdbc/config.sub	2014-06-29 14:04:38.843400000 +0400
-@@ -1293,7 +1293,7 @@
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-diff -Naur db-5.3.28-orig/lang/sql/odbc/aclocal.m4 db-5.3.28/lang/sql/odbc/aclocal.m4
--- db-5.3.28-orig/lang/sql/odbc/aclocal.m4	2009-12-16 04:19:00.000000000 +0300
-+++ db-5.3.28/lang/sql/odbc/aclocal.m4	2014-06-29 14:07:09.040200000 +0400
-@@ -595,7 +595,7 @@
-   ;;
- 
- AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+[*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32*)
-   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-   AC_CHECK_TOOL(AS, as, false)
-   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-@@ -715,7 +715,7 @@
-     lt_cv_sys_max_cmd_len=-1;
-     ;;
- 
-  cygwin* | mingw*)
-+  cygwin* | msys* | mingw*)
-     # On Win9x/ME, this test blows up -- it succeeds, but takes
-     # about 5 minutes as the teststring grows exponentially.
-     # Worse, since 9x/ME are not pre-emptively multitasking,
-@@ -927,7 +927,7 @@
-     lt_cv_dlopen_libs=
-    ;;
- 
-  cygwin*)
-+  cygwin* | msys*)
-     lt_cv_dlopen="dlopen"
-     lt_cv_dlopen_libs=
-    ;;
-@@ -1300,14 +1300,14 @@
-   # libtool to hard-code these into programs
-   ;;
- 
-cygwin* | mingw* | pw32*)
-+cygwin* | msys* | mingw* | pw32*)
-   version_type=windows
-   shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
- 
-   case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-+  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32*)
-     library_names_spec='$libname.dll.a'
-     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
-@@ -1327,6 +1327,11 @@
-       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
-+    msys*)
-+      # MSYS DLLs use 'msys-' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-     mingw*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-@@ -2304,7 +2309,7 @@
-   lt_cv_file_magic_test_file=/shlib/libc.so
-   ;;
- 
-cygwin*)
-+cygwin* | msys*)
-   # func_win32_libid is a shell function defined in ltmain.sh
-   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-   lt_cv_file_magic_cmd='func_win32_libid'
-@@ -2510,7 +2515,7 @@
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- LIBM=
- case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+*-*-beos* | *-*-cygwin* | *-*-msys* | *-*-pw32* | *-*-darwin*)
-   # These system don't have libm, or don't need it
-   ;;
- *-ncr-sysv4.3*)
-@@ -3021,7 +3026,7 @@
-     esac
-     ;;
- 
-  cygwin* | mingw* | pw32*)
-+  cygwin* | msys* | mingw* | pw32*)
-     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-     # as there is no search path for DLLs.
-     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-@@ -4658,7 +4663,7 @@
- aix*)
-   symcode='[[BCDT]]'
-   ;;
-cygwin* | mingw* | pw32*)
-+cygwin* | msys* | mingw* | pw32*)
-   symcode='[[ABCDGISTW]]'
-   ;;
- hpux*) # Its linker distinguishes data from code symbols
-@@ -4858,7 +4863,7 @@
-       # like `-m68040'.
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+    beos* | cygwin* | msys* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-       # PIC is the default for these OSes.
-       ;;
-     mingw* | os2* | pw32*)
-@@ -5131,7 +5136,7 @@
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-       ;;
- 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+    beos* | cygwin* | msys* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-       # PIC is the default for these OSes.
-       ;;
- 
-@@ -5376,7 +5381,7 @@
-   pw32*)
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-   ;;
-  cygwin* | mingw*)
-+  cygwin* | msys* | mingw*)
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   *)
-@@ -5423,7 +5428,7 @@
-   # Just being paranoid about ensuring that cc_basename is set.
-   _LT_CC_BASENAME([$compiler])
-   case $host_os in
-  cygwin* | mingw* | pw32*)
-+  cygwin* | msys* | mingw* | pw32*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -5509,7 +5514,7 @@
-       fi
-       ;;
- 
-    cygwin* | mingw* | pw32*)
-+    cygwin* | msys* | mingw* | pw32*)
-       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-       # as there is no search path for DLLs.
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-@@ -5809,7 +5814,7 @@
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-       ;;
- 
-    cygwin* | mingw* | pw32*)
-+    cygwin* | msys* | mingw* | pw32*)
-       # When not using gcc, we currently assume that we are using
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-diff -Naur db-5.3.28-orig/lang/sql/odbc/config.guess db-5.3.28/lang/sql/odbc/config.guess
--- db-5.3.28-orig/lang/sql/odbc/config.guess	2009-12-16 04:19:00.000000000 +0300
-+++ db-5.3.28/lang/sql/odbc/config.guess	2014-06-29 14:08:12.220200000 +0400
-@@ -775,6 +775,9 @@
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit 0 ;;
-+    i*:MSYS*:*)
-+	echo ${UNAME_MACHINE}-pc-msys
-+	exit 0 ;;
-     i*:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit 0 ;;
-@@ -796,6 +799,12 @@
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
- 	exit 0 ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-+	echo x86_64-unknown-cygwin
-+	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit 0 ;;
-diff -Naur db-5.3.28-orig/lang/sql/odbc/config.sub db-5.3.28/lang/sql/odbc/config.sub
--- db-5.3.28-orig/lang/sql/odbc/config.sub	2009-12-16 04:19:00.000000000 +0300
-+++ db-5.3.28/lang/sql/odbc/config.sub	2014-06-29 14:08:26.931000000 +0400
-@@ -1129,7 +1129,7 @@
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-diff -Naur db-5.3.28-orig/lang/sql/sqlite/aclocal.m4 db-5.3.28/lang/sql/sqlite/aclocal.m4
--- db-5.3.28-orig/lang/sql/sqlite/aclocal.m4	2013-09-09 19:35:05.000000000 +0400
-+++ db-5.3.28/lang/sql/sqlite/aclocal.m4	2014-06-29 14:10:35.974200000 +0400
-@@ -1523,7 +1523,7 @@
-     lt_cv_sys_max_cmd_len=-1;
-     ;;
- 
-  cygwin* | mingw* | cegcc*)
-+  cygwin* | msys* | mingw* | cegcc*)
-     # On Win9x/ME, this test blows up -- it succeeds, but takes
-     # about 5 minutes as the teststring grows exponentially.
-     # Worse, since 9x/ME are not pre-emptively multitasking,
-@@ -1750,7 +1750,7 @@
-     lt_cv_dlopen_libs=
-     ;;
- 
-  cygwin*)
-+  cygwin* | msys*)
-     lt_cv_dlopen="dlopen"
-     lt_cv_dlopen_libs=
-     ;;
-@@ -2207,14 +2207,14 @@
-   # libtool to hard-code these into programs
-   ;;
- 
-cygwin* | mingw* | pw32* | cegcc*)
-+cygwin* | msys* | mingw* | pw32* | cegcc*)
-   version_type=windows
-   shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
- 
-   case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
-     library_names_spec='$libname.dll.a'
-     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
-@@ -2237,6 +2237,11 @@
-       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
-+    msys*)
-+      # MSYS DLLs use 'msys-' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-     mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-@@ -3009,7 +3014,7 @@
-   lt_cv_file_magic_test_file=/shlib/libc.so
-   ;;
- 
-cygwin*)
-+cygwin* | msys*)
-   # func_win32_libid is a shell function defined in ltmain.sh
-   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-   lt_cv_file_magic_cmd='func_win32_libid'
-@@ -3276,7 +3281,7 @@
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- LIBM=
- case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+*-*-beos* | *-*-cygwin* | *-*-msys* | *-*-pw32* | *-*-darwin*)
-   # These system don't have libm, or don't need it
-   ;;
- *-ncr-sysv4.3*)
-@@ -3345,7 +3350,7 @@
- aix*)
-   symcode='[[BCDT]]'
-   ;;
-cygwin* | mingw* | pw32* | cegcc*)
-+cygwin* | msys* | mingw* | pw32* | cegcc*)
-   symcode='[[ABCDGISTW]]'
-   ;;
- hpux*)
-@@ -3591,7 +3596,7 @@
-     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-       # PIC is the default for these OSes.
-       ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-+    mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -3898,7 +3903,7 @@
-       # PIC is the default for these OSes.
-       ;;
- 
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -3968,7 +3973,7 @@
-       fi
-       ;;
- 
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       m4_if([$1], [GCJ], [],
-@@ -4199,7 +4204,7 @@
-   pw32*)
-     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-   ;;
-  cygwin* | mingw* | cegcc*)
-+  cygwin* | msys* | mingw* | cegcc*)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   *)
-@@ -4251,7 +4256,7 @@
-   extract_expsyms_cmds=
- 
-   case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -4338,7 +4343,7 @@
-       fi
-       ;;
- 
-    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-       # as there is no search path for DLLs.
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-@@ -4693,7 +4698,7 @@
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-       ;;
- 
-    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # When not using gcc, we currently assume that we are using
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -5637,7 +5642,7 @@
-         esac
-         ;;
- 
-      cygwin* | mingw* | pw32* | cegcc*)
-+      cygwin* | msys* | mingw* | pw32* | cegcc*)
-         # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-         # as there is no search path for DLLs.
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-@@ -7490,7 +7495,7 @@
- [enable_win32_dll=yes
- 
- case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-   AC_CHECK_TOOL(AS, as, false)
-   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-diff -Naur db-5.3.28-orig/lang/sql/sqlite/config.guess db-5.3.28/lang/sql/sqlite/config.guess
--- db-5.3.28-orig/lang/sql/sqlite/config.guess	2013-09-09 19:35:05.000000000 +0400
-+++ db-5.3.28/lang/sql/sqlite/config.guess	2014-06-29 14:11:14.490600000 +0400
-@@ -798,6 +798,9 @@
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit ;;
-+    i*:CYGWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-msys
-+	exit ;;
-     *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit ;;
-@@ -832,6 +835,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;
-diff -Naur db-5.3.28-orig/lang/sql/sqlite/config.sub db-5.3.28/lang/sql/sqlite/config.sub
--- db-5.3.28-orig/lang/sql/sqlite/config.sub	2013-09-09 19:35:05.000000000 +0400
-+++ db-5.3.28/lang/sql/sqlite/config.sub	2014-06-29 14:11:27.719400000 +0400
-@@ -1235,7 +1235,7 @@
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \