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

libyaml: Update to 0.2.1 (#1447)

Browse Source
This commit is contained in:
Peter Budai
2018-10-09 07:44:17 +03:00
committed by Алексей
parent 675e68ea7b
commit 933add875f
3 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libyaml/PKGBUILD
View File

@@ -1,7 +1,7 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=('libyaml' 'libyaml-devel')
pkgver=0.1.7
pkgver=0.2.1
pkgrel=1
pkgdesc="YAML 1.1 library"
arch=('i686' 'x86_64')
@@ -10,9 +10,9 @@ license=('MIT')
source=(https://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz
'yaml-0.1.7-fix-undefined.patch'
'yaml-0.1.7-msys2.patch')
sha256sums=('8088e457264a98ba451a90b8661fcb4f9d6f478f7265d48322a196cec2480729'
'6fae0d088cd67ad61a3ec83c03116bfb829276201a18ba583a9acc230e2f57f6'
'bea0e3d9d01b2769abb71c358babb2c2c98cc98ddb9ac2cd5dd77ed2932c2212')
sha256sums=('78281145641a080fb32d6e7a87b9c0664d611dcb4d542e90baf731f51cbb59cd'
'fba2535decf076c0a6b260db01e163e665c5fc92fe7edaa90246d31810082387'
'59360ea7313e4a022a774c151aa087974325d6458164f50441ff00437a5f76db')
prepare() {
cd "$srcdir/yaml-$pkgver"

14
libyaml/yaml-0.1.7-fix-undefined.patch
View File

@@ -2,20 +2,20 @@ diff -durN yaml-0.1.7.orig/src/Makefile.am yaml-0.1.7/src/Makefile.am
--- yaml-0.1.7.orig/src/Makefile.am 2016-08-29 07:56:34.000000000 +0800
+++ yaml-0.1.7/src/Makefile.am 2017-05-12 11:19:15.890625000 +0800
@@ -1,4 +1,4 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CPPFLAGS = -I$(top_srcdir)/include -Wall
lib_LTLIBRARIES = libyaml.la
libyaml_la_SOURCES = yaml_private.h api.c reader.c scanner.c parser.c loader.c writer.c emitter.c dumper.c
-libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)
+libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE) -no-undefined
-libyaml_la_LDFLAGS = -no-undefined -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)
+libyaml_la_LDFLAGS = -no-undefined -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE) -no-undefined
diff -durN yaml-0.1.7.orig/src/Makefile.in yaml-0.1.7/src/Makefile.in
--- yaml-0.1.7.orig/src/Makefile.in 2016-08-29 07:56:49.000000000 +0800
+++ yaml-0.1.7/src/Makefile.in 2017-05-12 11:19:57.546875000 +0800
@@ -312,7 +312,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
@@ -323,7 +323,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/include -Wall
lib_LTLIBRARIES = libyaml.la
libyaml_la_SOURCES = yaml_private.h api.c reader.c scanner.c parser.c loader.c writer.c emitter.c dumper.c
-libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)
+libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE) -no-undefined
-libyaml_la_LDFLAGS = -no-undefined -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)
+libyaml_la_LDFLAGS = -no-undefined -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE) -no-undefined
all: all-am
.SUFFIXES:

230
libyaml/yaml-0.1.7-msys2.patch
View File

@@ -1,7 +1,7 @@
diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/aclocal.m4
--- yaml-0.1.7.orig/aclocal.m4 2017-05-12 11:17:40.484375000 +0800
+++ yaml-0.1.7/aclocal.m4 2017-05-12 11:33:00.828125000 +0800
@@ -1643,7 +1643,7 @@
@@ -1706,7 +1706,7 @@
lt_cv_sys_max_cmd_len=-1;
;;
@@ -10,25 +10,25 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/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,
@@ -1891,7 +1891,7 @@
@@ -1954,7 +1954,7 @@
lt_cv_dlopen_libs=
;;
- cygwin*)
+ cygwin* | msys*)
lt_cv_dlopen="dlopen"
lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
@@ -2362,7 +2362,7 @@
@@ -2535,7 +2535,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
@@ -2394,6 +2394,11 @@
@@ -2567,6 +2567,11 @@
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
@@ -39,8 +39,8 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/aclocal.m4
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
@@ -2428,7 +2433,7 @@
soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
@@ -2601,7 +2606,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|^ ||'`
;;
@@ -49,16 +49,16 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/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...
@@ -3169,7 +3174,7 @@
@@ -3379,7 +3384,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
@@ -3225,7 +3230,7 @@
@@ -3472,7 +3477,7 @@
lt_cv_file_magic_test_file=/shlib/libc.so
;;
@@ -67,16 +67,16 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/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'
@@ -3531,7 +3536,7 @@
@@ -3785,7 +3790,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
@@ -3586,7 +3591,7 @@
@@ -3855,7 +3860,7 @@
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
@@ -85,7 +85,7 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/aclocal.m4
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -3661,7 +3666,7 @@
@@ -3930,7 +3935,7 @@
aix*)
symcode='[[BCDT]]'
;;
@@ -94,7 +94,7 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/aclocal.m4
symcode='[[ABCDGISTW]]'
;;
hpux*)
@@ -3929,7 +3934,7 @@
@@ -4236,7 +4241,7 @@
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
@@ -103,7 +103,7 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/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
@@ -4000,7 +4005,7 @@
@@ -4312,7 +4317,7 @@
;;
esac
;;
@@ -112,7 +112,7 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/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], [],
@@ -4247,7 +4252,7 @@
@@ -4560,7 +4565,7 @@
# PIC is the default for these OSes.
;;
@@ -121,8 +121,8 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/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
@@ -4332,7 +4337,7 @@
fi
@@ -4664,7 +4669,7 @@
esac
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
@@ -130,16 +130,16 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/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], [],
@@ -4592,7 +4597,7 @@
@@ -4939,7 +4944,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_.*'
@@ -4653,7 +4658,7 @@
@@ -4997,7 +5002,7 @@
extract_expsyms_cmds=
case $host_os in
@@ -148,7 +148,7 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/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++.
@@ -4771,7 +4776,7 @@
@@ -5112,7 +5117,7 @@
fi
;;
@@ -157,7 +157,7 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/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'
@@ -5145,7 +5150,7 @@
@@ -5568,7 +5573,7 @@
_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
@@ -166,7 +166,7 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/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
@@ -6142,7 +6147,7 @@
@@ -6639,7 +6644,7 @@
esac
;;
@@ -175,7 +175,7 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/aclocal.m4
case $GXX,$cc_basename in
,cl* | no,cl*)
# Native MSVC
@@ -7945,7 +7950,7 @@
@@ -8317,7 +8322,7 @@
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;;
@@ -184,7 +184,7 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/aclocal.m4
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
;;
* ) # otherwise, assume *nix
@@ -7953,12 +7958,12 @@
@@ -8325,12 +8330,12 @@
;;
esac
;;
@@ -199,7 +199,7 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/aclocal.m4
lt_cv_to_host_file_cmd=func_convert_file_noop
;;
* ) # otherwise, assume *nix
@@ -8121,7 +8126,7 @@
@@ -8495,7 +8500,7 @@
[enable_win32_dll=yes
case $host in
@@ -211,7 +211,7 @@ diff -durN yaml-0.1.7.orig/aclocal.m4 yaml-0.1.7/aclocal.m4
diff -durN yaml-0.1.7.orig/config/config.guess yaml-0.1.7/config/config.guess
--- yaml-0.1.7.orig/config/config.guess 2017-05-12 11:17:41.015625000 +0800
+++ yaml-0.1.7/config/config.guess 2017-05-12 11:35:35.640625000 +0800
@@ -866,6 +866,9 @@
@@ -867,6 +867,9 @@
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
@@ -224,16 +224,16 @@ diff -durN yaml-0.1.7.orig/config/config.guess yaml-0.1.7/config/config.guess
diff -durN yaml-0.1.7.orig/config/ltmain.sh yaml-0.1.7/config/ltmain.sh
--- yaml-0.1.7.orig/config/ltmain.sh 2017-05-12 11:17:41.031250000 +0800
+++ yaml-0.1.7/config/ltmain.sh 2017-05-12 11:44:26.968750000 +0800
@@ -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 @@
@@ -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
@@ -242,16 +242,16 @@ diff -durN yaml-0.1.7.orig/config/ltmain.sh yaml-0.1.7/config/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
@@ -260,7 +260,7 @@ diff -durN yaml-0.1.7.orig/config/ltmain.sh yaml-0.1.7/config/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
@@ -269,16 +269,16 @@ diff -durN yaml-0.1.7.orig/config/ltmain.sh yaml-0.1.7/config/ltmain.sh
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
@@ -287,43 +287,43 @@ diff -durN yaml-0.1.7.orig/config/ltmain.sh yaml-0.1.7/config/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
@@ -332,16 +332,16 @@ diff -durN yaml-0.1.7.orig/config/ltmain.sh yaml-0.1.7/config/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
@@ -349,36 +349,36 @@ diff -durN yaml-0.1.7.orig/config/ltmain.sh yaml-0.1.7/config/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"
@@ -6548,7 +6548,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
@@ -6692,7 +6692,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
@@ -6762,7 +6762,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"
@@ -7626,7 +7626,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*)
@@ -386,7 +386,7 @@ diff -durN yaml-0.1.7.orig/config/ltmain.sh yaml-0.1.7/config/ltmain.sh
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
@@ -8140,7 +8140,7 @@
@@ -9626,7 +9626,7 @@
orig_export_symbols=
case $host_os in
@@ -394,8 +394,8 @@ diff -durN yaml-0.1.7.orig/config/ltmain.sh yaml-0.1.7/config/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
@@ -8696,7 +8696,7 @@
func_dll_def_p "$export_symbols" || {
@@ -10185,7 +10185,7 @@
prog)
case $host in
@@ -404,25 +404,25 @@ diff -durN yaml-0.1.7.orig/config/ltmain.sh yaml-0.1.7/config/ltmain.sh
output=$func_stripname_result.exe;;
esac
test -n "$vinfo" && \
@@ -8809,7 +8809,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*'`
+ *-*-cygwin* | *msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
@@ -8887,7 +8887,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
@@ -9034,14 +9034,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
@@ -439,19 +439,19 @@ diff -durN yaml-0.1.7.orig/config/ltmain.sh yaml-0.1.7/config/ltmain.sh
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
@@ -9371,7 +9371,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"
diff -durN yaml-0.1.7.orig/configure yaml-0.1.7/configure
--- yaml-0.1.7.orig/configure 2017-05-12 11:17:40.468750000 +0800
+++ yaml-0.1.7/configure 2017-05-12 11:51:24.515625000 +0800
@@ -4919,7 +4919,7 @@
@@ -4933,7 +4933,7 @@
lt_cv_sys_max_cmd_len=-1;
;;
@@ -460,7 +460,7 @@ diff -durN yaml-0.1.7.orig/configure yaml-0.1.7/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,
@@ -5109,7 +5109,7 @@
@@ -5099,7 +5099,7 @@
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;;
@@ -469,7 +469,7 @@ diff -durN yaml-0.1.7.orig/configure yaml-0.1.7/configure
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
;;
* ) # otherwise, assume *nix
@@ -5117,12 +5117,12 @@
@@ -5107,12 +5107,12 @@
;;
esac
;;
@@ -484,16 +484,16 @@ diff -durN yaml-0.1.7.orig/configure yaml-0.1.7/configure
lt_cv_to_host_file_cmd=func_convert_file_noop
;;
* ) # otherwise, assume *nix
@@ -5188,7 +5188,7 @@
@@ -5178,7 +5178,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
@@ -5346,7 +5346,7 @@
@@ -5336,7 +5336,7 @@
lt_cv_file_magic_test_file=/shlib/libc.so
;;
@@ -502,16 +502,16 @@ diff -durN yaml-0.1.7.orig/configure yaml-0.1.7/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'
@@ -5663,7 +5663,7 @@
@@ -5655,7 +5655,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
@@ -6156,7 +6156,7 @@
@@ -6148,7 +6148,7 @@
aix*)
symcode='[BCDT]'
;;
@@ -520,7 +520,7 @@ diff -durN yaml-0.1.7.orig/configure yaml-0.1.7/configure
symcode='[ABCDGISTW]'
;;
hpux*)
@@ -8118,7 +8118,7 @@
@@ -8356,7 +8356,7 @@
# PIC is the default for these OSes.
;;
@@ -529,8 +529,8 @@ diff -durN yaml-0.1.7.orig/configure yaml-0.1.7/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
@@ -8202,7 +8202,7 @@
fi
@@ -8459,7 +8459,7 @@
esac
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
@@ -538,7 +538,7 @@ diff -durN yaml-0.1.7.orig/configure yaml-0.1.7/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'
@@ -8693,7 +8693,7 @@
@@ -8961,7 +8961,7 @@
extract_expsyms_cmds=
case $host_os in
@@ -547,7 +547,7 @@ diff -durN yaml-0.1.7.orig/configure yaml-0.1.7/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++.
@@ -8811,7 +8811,7 @@
@@ -9076,7 +9076,7 @@
fi
;;
@@ -556,7 +556,7 @@ diff -durN yaml-0.1.7.orig/configure yaml-0.1.7/configure
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -9269,7 +9269,7 @@
@@ -9616,7 +9616,7 @@
export_dynamic_flag_spec=-rdynamic
;;
@@ -565,16 +565,16 @@ diff -durN yaml-0.1.7.orig/configure yaml-0.1.7/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
@@ -10222,7 +10222,7 @@
@@ -10651,7 +10651,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
@@ -10254,6 +10254,11 @@
@@ -10683,6 +10683,11 @@
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
@@ -585,8 +585,8 @@ diff -durN yaml-0.1.7.orig/configure yaml-0.1.7/configure
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -10288,7 +10293,7 @@
soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
@@ -10717,7 +10722,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|^ ||'`
;;
@@ -595,12 +595,12 @@ diff -durN yaml-0.1.7.orig/configure yaml-0.1.7/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...
@@ -10950,7 +10955,7 @@
@@ -11419,7 +11424,7 @@
lt_cv_dlopen_libs=
;;
- cygwin*)
+ cygwin* | msys*)
lt_cv_dlopen="dlopen"
lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;