Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

neon: Update to 0.30.2

Browse Source
This commit is contained in:
atom.long
2017-05-30 23:38:05 +08:00
parent 17e17b296c
commit eb4188ce1a
2 changed files with 138 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
neon/PKGBUILD
View File

@@ -2,7 +2,7 @@
pkgbase=neon
pkgname=("lib${pkgbase}" "lib${pkgbase}-devel")
pkgver=0.30.0
pkgver=0.30.2
pkgrel=1
pkgdesc="HTTP and WebDAV client library with a C interface"
arch=('i686' 'x86_64')
@@ -12,15 +12,15 @@ depends=('libexpat' 'openssl' 'ca-certificates')
makedepends=('libexpat-devel' 'openssl-devel')
options=('libtool') # FS#16067
source=(http://www.webdav.org/${pkgbase}/${pkgbase}-${pkgver}.tar.gz{,.asc}
neon-0.30.0-msys2.patch)
sha256sums=('2962cfcb5d30f3272e3d2fa0e473434419770a3801afe3d46e5d1650787990c2'
neon-0.30.2-msys2.patch)
sha256sums=('db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca'
'SKIP'
'd921882c79610e780186a31b6f70bc8f5f579067cc5959d49fc1ea3b86efea57')
'ddf8bc1f4f3f9873c6b1d0bf66f6db23eb42da9125d700ee2e065ca59bafff69')
prepare() {
cd "${srcdir}"/${pkgbase}-${pkgver}
patch -p1 -i ${srcdir}/neon-0.30.0-msys2.patch
patch -p1 -i ${srcdir}/neon-0.30.2-msys2.patch
#autoreconf -fi
}

266
neon/neon-0.30.0-msys2.patch → neon/neon-0.30.2-msys2.patch
View File

@@ -1,7 +1,7 @@
diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
--- neon-0.30.0-orig/aclocal.m4 2013-07-31 20:04:33.000000000 +0400
+++ neon-0.30.0/aclocal.m4 2013-08-09 22:45:56.307617200 +0400
@@ -1622,7 +1622,7 @@
diff -durN neon-0.30.2.orig/aclocal.m4 neon-0.30.2/aclocal.m4
--- neon-0.30.2.orig/aclocal.m4 2016-09-30 17:33:35.000000000 +0800
+++ neon-0.30.2/aclocal.m4 2017-05-20 10:52:39.000000000 +0800
@@ -1698,7 +1698,7 @@
lt_cv_sys_max_cmd_len=-1;
;;
@@ -10,25 +10,25 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
# 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,
@@ -1869,7 +1869,7 @@
@@ -1946,7 +1946,7 @@
lt_cv_dlopen_libs=
;;
- cygwin*)
+ cygwin* | msys*)
lt_cv_dlopen="dlopen"
lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
@@ -2340,7 +2340,7 @@
@@ -2527,7 +2527,7 @@
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=".dll"
shrext_cmds=.dll
need_version=no
@@ -2372,6 +2372,12 @@
@@ -2559,6 +2559,12 @@
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
@@ -40,8 +40,8 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
@@ -2406,7 +2412,7 @@
soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
@@ -2593,7 +2599,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|^ ||'`
;;
@@ -50,16 +50,16 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
# 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...
@@ -3150,7 +3156,7 @@
@@ -3374,7 +3380,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
if test yes != "$GCC"; then
reload_cmds=false
fi
@@ -3206,7 +3212,7 @@
@@ -3467,7 +3473,7 @@
lt_cv_file_magic_test_file=/shlib/libc.so
;;
@@ -68,16 +68,16 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
# 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'
@@ -3516,7 +3522,7 @@
@@ -3780,7 +3786,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
# two different shell functions defined in ltmain.sh;
# decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
@@ -3571,7 +3577,7 @@
@@ -3850,7 +3856,7 @@
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
@@ -86,7 +86,7 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -3646,7 +3652,7 @@
@@ -3925,7 +3931,7 @@
aix*)
symcode='[[BCDT]]'
;;
@@ -95,7 +95,7 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
symcode='[[ABCDGISTW]]'
;;
hpux*)
@@ -3914,7 +3920,7 @@
@@ -4231,7 +4237,7 @@
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
@@ -104,7 +104,7 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
# 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
@@ -3985,7 +3991,7 @@
@@ -4307,7 +4313,7 @@
;;
esac
;;
@@ -113,7 +113,7 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
# 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], [],
@@ -4232,7 +4238,7 @@
@@ -4555,7 +4561,7 @@
# PIC is the default for these OSes.
;;
@@ -122,8 +122,8 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
# 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
@@ -4317,7 +4323,7 @@
fi
@@ -4659,7 +4665,7 @@
esac
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
@@ -131,16 +131,16 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
# 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], [],
@@ -4577,7 +4583,7 @@
@@ -4934,7 +4940,7 @@
pw32*)
_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
_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_.*'
@@ -4635,7 +4641,7 @@
@@ -4992,7 +4998,7 @@
extract_expsyms_cmds=
case $host_os in
@@ -149,7 +149,7 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
# 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++.
@@ -4750,7 +4756,7 @@
@@ -5107,7 +5113,7 @@
fi
;;
@@ -158,7 +158,7 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
# _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'
@@ -5123,7 +5129,7 @@
@@ -5563,7 +5569,7 @@
_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
@@ -167,7 +167,7 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -6120,7 +6126,7 @@
@@ -6634,7 +6640,7 @@
esac
;;
@@ -176,31 +176,31 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
case $GXX,$cc_basename in
,cl* | no,cl*)
# Native MSVC
@@ -7926,7 +7932,7 @@
@@ -8312,7 +8318,7 @@
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
+ *-*-cygwin* | *-*-msys*)
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
;;
* ) # otherwise, assume *nix
@@ -7934,12 +7940,12 @@
@@ -8320,12 +8326,12 @@
;;
esac
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
+ *-*-cygwin* | *-*-msys*)
case $build in
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
+ *-*-cygwin* | *-*-msys*)
lt_cv_to_host_file_cmd=func_convert_file_noop
;;
* ) # otherwise, assume *nix
@@ -8102,7 +8108,7 @@
@@ -8490,7 +8496,7 @@
[enable_win32_dll=yes
case $host in
@@ -209,10 +209,10 @@ diff -Naur neon-0.30.0-orig/aclocal.m4 neon-0.30.0/aclocal.m4
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
diff -Naur neon-0.30.0-orig/config.guess neon-0.30.0/config.guess
--- neon-0.30.0-orig/config.guess 2013-07-31 20:04:29.000000000 +0400
+++ neon-0.30.0/config.guess 2013-08-09 22:46:42.307617200 +0400
@@ -849,6 +849,9 @@
diff -durN neon-0.30.2.orig/config.guess neon-0.30.2/config.guess
--- neon-0.30.2.orig/config.guess 2016-09-30 17:33:33.000000000 +0800
+++ neon-0.30.2/config.guess 2017-05-20 10:55:55.421875000 +0800
@@ -866,6 +866,9 @@
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
@@ -222,10 +222,10 @@ diff -Naur neon-0.30.0-orig/config.guess neon-0.30.0/config.guess
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit ;;
diff -Naur neon-0.30.0-orig/configure neon-0.30.0/configure
--- neon-0.30.0-orig/configure 2013-07-31 20:04:35.000000000 +0400
+++ neon-0.30.0/configure 2013-08-09 22:48:15.854492200 +0400
@@ -8090,7 +8090,7 @@
diff -durN neon-0.30.2.orig/configure neon-0.30.2/configure
--- neon-0.30.2.orig/configure 2016-09-30 17:33:36.000000000 +0800
+++ neon-0.30.2/configure 2017-05-20 10:59:35.078125000 +0800
@@ -8104,7 +8104,7 @@
lt_cv_sys_max_cmd_len=-1;
;;
@@ -234,40 +234,40 @@ diff -Naur neon-0.30.0-orig/configure neon-0.30.0/configure
# 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,
@@ -8279,7 +8279,7 @@
@@ -8270,7 +8270,7 @@
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
+ *-*-cygwin* | *-*-msys*)
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
;;
* ) # otherwise, assume *nix
@@ -8287,12 +8287,12 @@
@@ -8278,12 +8278,12 @@
;;
esac
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
+ *-*-cygwin* | *-*-msys*)
case $build in
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
+ *-*-cygwin* | *-*-msys*)
lt_cv_to_host_file_cmd=func_convert_file_noop
;;
* ) # otherwise, assume *nix
@@ -8358,7 +8358,7 @@
@@ -8349,7 +8349,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
if test yes != "$GCC"; then
reload_cmds=false
fi
@@ -8516,7 +8516,7 @@
@@ -8507,7 +8507,7 @@
lt_cv_file_magic_test_file=/shlib/libc.so
;;
@@ -276,16 +276,16 @@ diff -Naur neon-0.30.0-orig/configure neon-0.30.0/configure
# 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'
@@ -8837,7 +8837,7 @@
@@ -8826,7 +8826,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
# two different shell functions defined in ltmain.sh;
# decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
@@ -9371,7 +9371,7 @@
@@ -9360,7 +9360,7 @@
aix*)
symcode='[BCDT]'
;;
@@ -294,7 +294,7 @@ diff -Naur neon-0.30.0-orig/configure neon-0.30.0/configure
symcode='[ABCDGISTW]'
;;
hpux*)
@@ -11160,7 +11160,7 @@
@@ -11408,7 +11408,7 @@
# PIC is the default for these OSes.
;;
@@ -303,8 +303,8 @@ diff -Naur neon-0.30.0-orig/configure neon-0.30.0/configure
# 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
@@ -11244,7 +11244,7 @@
fi
@@ -11511,7 +11511,7 @@
esac
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
@@ -312,7 +312,7 @@ diff -Naur neon-0.30.0-orig/configure neon-0.30.0/configure
# 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).
lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -11735,7 +11735,7 @@
@@ -12013,7 +12013,7 @@
extract_expsyms_cmds=
case $host_os in
@@ -321,7 +321,7 @@ diff -Naur neon-0.30.0-orig/configure neon-0.30.0/configure
# 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++.
@@ -11850,7 +11850,7 @@
@@ -12128,7 +12128,7 @@
fi
;;
@@ -330,7 +330,7 @@ diff -Naur neon-0.30.0-orig/configure neon-0.30.0/configure
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -12307,7 +12307,7 @@
@@ -12668,7 +12668,7 @@
export_dynamic_flag_spec=-rdynamic
;;
@@ -339,16 +339,16 @@ diff -Naur neon-0.30.0-orig/configure neon-0.30.0/configure
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -13260,7 +13260,7 @@
@@ -13703,7 +13703,7 @@
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=".dll"
shrext_cmds=.dll
need_version=no
@@ -13292,6 +13292,12 @@
@@ -13735,6 +13735,12 @@
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
@@ -360,8 +360,8 @@ diff -Naur neon-0.30.0-orig/configure neon-0.30.0/configure
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -13326,7 +13332,7 @@
soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
@@ -13769,7 +13775,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|^ ||'`
;;
@@ -370,28 +370,28 @@ diff -Naur neon-0.30.0-orig/configure neon-0.30.0/configure
# 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...
@@ -13991,7 +13997,7 @@
@@ -14474,7 +14480,7 @@
lt_cv_dlopen_libs=
;;
- cygwin*)
+ cygwin* | msys*)
lt_cv_dlopen="dlopen"
lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
diff -Naur neon-0.30.0-orig/ltmain.sh neon-0.30.0/ltmain.sh
--- neon-0.30.0-orig/ltmain.sh 2013-07-31 20:04:29.000000000 +0400
+++ neon-0.30.0/ltmain.sh 2013-08-09 22:56:47.604492200 +0400
@@ -1180,7 +1180,7 @@
test "$opt_debug" = : || func_append preserve_args " --debug"
case $host in
- *cygwin* | *mingw* | *pw32* | *cegcc*)
+ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc*)
# don't eliminate duplications in $postdeps and $predeps
opt_duplicate_compiler_generated_deps=:
;;
@@ -2123,7 +2123,7 @@
diff -durN neon-0.30.2.orig/ltmain.sh neon-0.30.2/ltmain.sh
--- neon-0.30.2.orig/ltmain.sh 2016-09-30 17:33:33.000000000 +0800
+++ neon-0.30.2/ltmain.sh 2017-05-20 11:06:02.687500000 +0800
@@ -2418,7 +2418,7 @@
case $host in
# Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
# see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
# don't eliminate duplications in $postdeps and $predeps
opt_duplicate_compiler_generated_deps=:
;;
@@ -3439,7 +3439,7 @@
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
@@ -400,16 +400,16 @@ diff -Naur neon-0.30.0-orig/ltmain.sh neon-0.30.0/ltmain.sh
pic_mode=default
;;
esac
@@ -2992,7 +2992,7 @@
@@ -4313,7 +4313,7 @@
'exit $?'
tstripme="$stripme"
tstripme=$stripme
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
case $realname in
*.dll.a)
tstripme=""
@@ -3098,7 +3098,7 @@
tstripme=
@@ -4426,7 +4426,7 @@
# Do a test to see if this is really a libtool program.
case $host in
@@ -418,25 +418,25 @@ diff -Naur neon-0.30.0-orig/ltmain.sh neon-0.30.0/ltmain.sh
if func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
wrapper=$func_ltwrapper_scriptname_result
@@ -3173,7 +3173,7 @@
@@ -4501,7 +4501,7 @@
# remove .exe since cygwin /usr/bin/install will append another
# one anyway
case $install_prog,$host in
- */usr/bin/install*,*cygwin*)
+ */usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*)
+ */usr/bin/install*,*cygwin* | */usr/bin/install*,*msys*)
case $file:$destfile in
*.exe:*.exe)
# this is ok
@@ -3323,7 +3323,7 @@
@@ -4654,7 +4654,7 @@
$RM $export_symbols
eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
;;
@@ -3335,7 +3335,7 @@
@@ -4666,7 +4666,7 @@
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -445,43 +445,43 @@ diff -Naur neon-0.30.0-orig/ltmain.sh neon-0.30.0/ltmain.sh
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@ -3349,7 +3349,7 @@
@@ -4680,7 +4680,7 @@
func_basename "$dlprefile"
name="$func_basename_result"
name=$func_basename_result
case $host in
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
# if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile"
@@ -3502,7 +3502,7 @@
@@ -4855,7 +4855,7 @@
# Transform the symbol file into the correct name.
symfileobj="$output_objdir/${my_outputname}S.$objext"
symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
@@ -4375,7 +4375,7 @@
@@ -5753,7 +5753,7 @@
{
EOF
case "$host" in
case $host in
- *mingw* | *cygwin* )
+ *mingw* | *cygwin* | *msys* )
+ *mingw* | *cygwin* | *msys*)
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
;;
@@ -5094,7 +5094,7 @@
{
$opt_debug
@@ -6492,7 +6492,7 @@
$debug_cmd
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
# which system we are compiling for in order to pass an extra
@@ -5581,7 +5581,7 @@
# what system we are compiling for in order to pass an extra
@@ -6991,7 +6991,7 @@
;;
esac
case $host in
@@ -490,16 +490,16 @@ diff -Naur neon-0.30.0-orig/ltmain.sh neon-0.30.0/ltmain.sh
testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
@@ -5601,7 +5601,7 @@
@@ -7011,7 +7011,7 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -5679,7 +5679,7 @@
@@ -7094,7 +7094,7 @@
-no-install)
case $host in
@@ -507,36 +507,36 @@ diff -Naur neon-0.30.0-orig/ltmain.sh neon-0.30.0/ltmain.sh
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
# The PATH hackery in wrapper scripts is required on Windows
# and Darwin in order for the loader to find any dlls it needs.
func_warning "\`-no-install' is ignored for $host"
@@ -6545,7 +6545,7 @@
func_warning "'-no-install' is ignored for $host"
@@ -7988,7 +7988,7 @@
fi
case "$host" in
case $host in
# special handling for platforms with PE-DLLs.
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
# Linker will automatically link against shared library if both
# static and shared are present. Therefore, ensure we extract
# symbols from the import library if a shared library is present
@@ -6689,7 +6689,7 @@
@@ -8132,7 +8132,7 @@
if test -n "$library_names" &&
{ test "$use_static_libs" = no || test -z "$old_library"; }; then
{ test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host in
- *cygwin* | *mingw* | *cegcc*)
+ *cygwin* | *msys* | *mingw* | *cegcc*)
- *cygwin* | *mingw* | *cegcc* | *os2*)
+ *cygwin* | *msys* | *mingw* | *cegcc* | *os2*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
@@ -6759,7 +6759,7 @@
@@ -8202,7 +8202,7 @@
elif test -n "$soname_spec"; then
# bleh windows
case $host in
- *cygwin* | mingw* | *cegcc*)
+ *cygwin* | *msys* | mingw* | *cegcc*)
- *cygwin* | mingw* | *cegcc* | *os2*)
+ *cygwin* | *msys* | mingw* | *cegcc* | *os2*)
func_arith $current - $age
major=$func_arith_result
versuffix="-$major"
@@ -7620,7 +7620,7 @@
if test "$build_libtool_libs" = yes; then
versuffix=-$major
@@ -9112,7 +9112,7 @@
if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -544,7 +544,7 @@ diff -Naur neon-0.30.0-orig/ltmain.sh neon-0.30.0/ltmain.sh
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
@@ -8134,7 +8134,7 @@
@@ -9626,7 +9626,7 @@
orig_export_symbols=
case $host_os in
@@ -552,8 +552,8 @@ diff -Naur neon-0.30.0-orig/ltmain.sh neon-0.30.0/ltmain.sh
+ cygwin* | msys* | mingw* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
@@ -8690,7 +8690,7 @@
func_dll_def_p "$export_symbols" || {
@@ -10185,7 +10185,7 @@
prog)
case $host in
@@ -562,25 +562,25 @@ diff -Naur neon-0.30.0-orig/ltmain.sh neon-0.30.0/ltmain.sh
output=$func_stripname_result.exe;;
esac
test -n "$vinfo" && \
@@ -8803,7 +8803,7 @@
@@ -10296,7 +10296,7 @@
esac
fi
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
@@ -8881,7 +8881,7 @@
@@ -10374,7 +10374,7 @@
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
wrappers_required=no
wrappers_required=false
;;
- *cygwin* | *mingw* )
+ *cygwin* | *msys* | *mingw* )
if test "$build_libtool_libs" != yes; then
wrappers_required=no
fi
@@ -9028,14 +9028,14 @@
test yes = "$build_libtool_libs" || wrappers_required=false
;;
*)
@@ -10520,14 +10520,14 @@
esac
# test for cygwin because mv fails w/o .exe extensions
case $host in
@@ -597,12 +597,12 @@ diff -Naur neon-0.30.0-orig/ltmain.sh neon-0.30.0/ltmain.sh
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
@@ -9365,7 +9365,7 @@
@@ -10859,7 +10859,7 @@
# tests/bindir.at for full details.
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there.
if test "x$bindir" != x ;
then
if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir"