255 lines
8.5 KiB
Diff
255 lines
8.5 KiB
Diff
diff -Naur sqlite-autoconf-3080001-orig/aclocal.m4 sqlite-autoconf-3080001/aclocal.m4
|
|
--- sqlite-autoconf-3080001-orig/aclocal.m4 2013-08-29 21:47:31.000000000 +0400
|
|
+++ sqlite-autoconf-3080001/aclocal.m4 2013-08-30 13:08:18.877929700 +0400
|
|
@@ -1630,7 +1630,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,
|
|
@@ -1877,7 +1877,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -2348,7 +2348,7 @@
|
|
# 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
|
|
@@ -2380,6 +2380,12 @@
|
|
m4_if([$1], [],[
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
|
|
;;
|
|
+ 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}'
|
|
+m4_if([$1], [],[
|
|
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
|
|
+ ;;
|
|
mingw* | cegcc*)
|
|
# MinGW DLLs use traditional 'lib' prefix
|
|
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
|
|
@@ -2414,7 +2420,7 @@
|
|
# Convert to MSYS style.
|
|
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
|
|
;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Convert to unix form, then to dos form, then back to unix form
|
|
# but this time dos style (no spaces!) so that the unix form looks
|
|
# like /cygdrive/c/PROGRA~1:/cygdr...
|
|
@@ -3154,7 +3160,7 @@
|
|
esac
|
|
reload_cmds='$LD$reload_flag -o $output$reload_objs'
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
if test "$GCC" != yes; then
|
|
reload_cmds=false
|
|
fi
|
|
@@ -3210,7 +3216,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'
|
|
@@ -3520,7 +3526,7 @@
|
|
[lt_cv_sharedlib_from_linklib_cmd='unknown'
|
|
|
|
case $host_os in
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# two different shell functions defined in ltmain.sh
|
|
# decide which to use based on capabilities of $DLLTOOL
|
|
case `$DLLTOOL --help 2>&1` in
|
|
@@ -3575,7 +3581,7 @@
|
|
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
LIBM=
|
|
case $host in
|
|
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
|
|
# These system don't have libm, or don't need it
|
|
;;
|
|
*-ncr-sysv4.3*)
|
|
@@ -3650,7 +3656,7 @@
|
|
aix*)
|
|
symcode='[[BCDT]]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[[ABCDGISTW]]'
|
|
;;
|
|
hpux*)
|
|
@@ -3918,7 +3924,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
|
|
@@ -3989,7 +3995,7 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- 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).
|
|
m4_if([$1], [GCJ], [],
|
|
@@ -4236,7 +4242,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
|
|
@@ -4321,7 +4327,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], [],
|
|
@@ -4581,7 +4587,7 @@
|
|
pw32*)
|
|
_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
|
|
;;
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
case $cc_basename in
|
|
cl*)
|
|
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
|
|
@@ -4639,7 +4645,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++.
|
|
@@ -4754,7 +4760,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'
|
|
@@ -5127,7 +5133,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
|
|
@@ -6124,7 +6130,7 @@
|
|
esac
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
case $GXX,$cc_basename in
|
|
,cl* | no,cl*)
|
|
# Native MSVC
|
|
@@ -7930,7 +7936,7 @@
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -7938,12 +7944,12 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
case $build in
|
|
*-*-mingw* ) # actually msys
|
|
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
|
|
;;
|
|
- *-*-cygwin* )
|
|
+ *-*-cygwin* | *-*-msys* )
|
|
lt_cv_to_host_file_cmd=func_convert_file_noop
|
|
;;
|
|
* ) # otherwise, assume *nix
|
|
@@ -8106,7 +8112,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 sqlite-autoconf-3080001-orig/config.guess sqlite-autoconf-3080001/config.guess
|
|
--- sqlite-autoconf-3080001-orig/config.guess 2013-08-29 21:47:30.000000000 +0400
|
|
+++ sqlite-autoconf-3080001/config.guess 2013-08-30 13:09:08.752929700 +0400
|
|
@@ -844,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 sqlite-autoconf-3080001-orig/tea/tclconfig/tcl.m4 sqlite-autoconf-3080001/tea/tclconfig/tcl.m4
|
|
--- sqlite-autoconf-3080001-orig/tea/tclconfig/tcl.m4 2013-08-29 21:47:30.000000000 +0400
|
|
+++ sqlite-autoconf-3080001/tea/tclconfig/tcl.m4 2013-08-30 13:04:21.379882800 +0400
|
|
@@ -1423,7 +1423,7 @@
|
|
CC_SEARCH_FLAGS=""
|
|
LD_SEARCH_FLAGS=""
|
|
;;
|
|
- CYGWIN_*)
|
|
+ CYGWIN_* | *MSYS_*)
|
|
SHLIB_CFLAGS=""
|
|
SHLIB_LD='${CC} -shared'
|
|
SHLIB_SUFFIX=".dll"
|
|
@@ -1997,7 +1997,7 @@
|
|
case $system in
|
|
AIX-*) ;;
|
|
BSD/OS*) ;;
|
|
- CYGWIN_*|MINGW32_*) ;;
|
|
+ CYGWIN_*|MINGW32_*|MSYS_*) ;;
|
|
IRIX*) ;;
|
|
NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
|
|
Darwin-*) ;;
|
|
@@ -2870,7 +2870,7 @@
|
|
EXEEXT=".exe"
|
|
TEA_PLATFORM="windows"
|
|
;;
|
|
- *CYGWIN_*)
|
|
+ *CYGWIN_* | *MSYS_*)
|
|
CYGPATH=echo
|
|
EXEEXT=".exe"
|
|
# TEA_PLATFORM is determined later in LOAD_TCLCONFIG
|