diff --git a/yaml/PKGBUILD b/yaml/PKGBUILD index 91d7e2fb..37b3960d 100644 --- a/yaml/PKGBUILD +++ b/yaml/PKGBUILD @@ -1,24 +1,24 @@ # Maintainer: Alexey Pavlov pkgname=('libyaml' 'libyaml-devel') -pkgver=0.1.4 +pkgver=0.1.7 pkgrel=1 pkgdesc="YAML 1.1 library" arch=('i686' 'x86_64') url="http://pyyaml.org/wiki/LibYAML" license=('MIT') source=(http://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz - 'yaml-0.1.4-fix-undefined.patch' - 'yaml-0.1.4-msys2.patch') -sha256sums=('7bf81554ae5ab2d9b6977da398ea789722e0db75b86bffdaeb4e66d961de6a37' - '646a918a9212c392350578e46fd4e1e8f9b433e69cd11e705b95c77d1439e2ae' - '4284291aecb1dfd08a93e20501eba932c55263c85acd22bd15973bae4433cdf4') + 'yaml-0.1.7-fix-undefined.patch' + 'yaml-0.1.7-msys2.patch') +sha256sums=('8088e457264a98ba451a90b8661fcb4f9d6f478f7265d48322a196cec2480729' + '6fae0d088cd67ad61a3ec83c03116bfb829276201a18ba583a9acc230e2f57f6' + 'bea0e3d9d01b2769abb71c358babb2c2c98cc98ddb9ac2cd5dd77ed2932c2212') prepare() { cd "$srcdir/yaml-$pkgver" - patch -p1 -i ${srcdir}/yaml-0.1.4-fix-undefined.patch - patch -p1 -i ${srcdir}/yaml-0.1.4-msys2.patch + patch -p1 -i ${srcdir}/yaml-0.1.7-fix-undefined.patch + patch -p1 -i ${srcdir}/yaml-0.1.7-msys2.patch autoreconf -fi } @@ -27,6 +27,7 @@ build() { cd "$srcdir/yaml-$pkgver" ./configure --build=${CHOST} --prefix=/usr make + setup } setup() { diff --git a/yaml/yaml-0.1.4-fix-undefined.patch b/yaml/yaml-0.1.7-fix-undefined.patch similarity index 67% rename from yaml/yaml-0.1.4-fix-undefined.patch rename to yaml/yaml-0.1.7-fix-undefined.patch index 8cbfb181..1c39dbc7 100644 --- a/yaml/yaml-0.1.4-fix-undefined.patch +++ b/yaml/yaml-0.1.7-fix-undefined.patch @@ -1,14 +1,16 @@ ---- yaml-0.1.4/src/Makefile.am.orig 2011-05-29 09:55:42.000000000 +0400 -+++ yaml-0.1.4/src/Makefile.am 2013-07-25 19:30:02.595703100 +0400 +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 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 ---- yaml-0.1.4/src/Makefile.in.orig 2013-07-23 10:23:04.178711000 +0400 -+++ yaml-0.1.4/src/Makefile.in 2013-07-25 19:29:55.486328100 +0400 -@@ -211,7 +211,7 @@ +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 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 diff --git a/yaml/yaml-0.1.4-msys2.patch b/yaml/yaml-0.1.7-msys2.patch similarity index 62% rename from yaml/yaml-0.1.4-msys2.patch rename to yaml/yaml-0.1.7-msys2.patch index d7ea1bb5..b8d24d63 100644 --- a/yaml/yaml-0.1.4-msys2.patch +++ b/yaml/yaml-0.1.7-msys2.patch @@ -1,7 +1,7 @@ -diff -Naur yaml-0.1.4-orig/aclocal.m4 yaml-0.1.4/aclocal.m4 ---- yaml-0.1.4-orig/aclocal.m4 2011-05-31 05:59:40.000000000 +0400 -+++ yaml-0.1.4/aclocal.m4 2013-07-23 10:12:33.171875000 +0400 -@@ -1531,7 +1531,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 @@ lt_cv_sys_max_cmd_len=-1; ;; @@ -10,7 +10,7 @@ diff -Naur yaml-0.1.4-orig/aclocal.m4 yaml-0.1.4/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, -@@ -1758,7 +1758,7 @@ +@@ -1891,7 +1891,7 @@ lt_cv_dlopen_libs= ;; @@ -19,7 +19,7 @@ diff -Naur yaml-0.1.4-orig/aclocal.m4 yaml-0.1.4/aclocal.m4 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs= ;; -@@ -2215,14 +2215,14 @@ +@@ -2362,7 +2362,7 @@ # libtool to hard-code these into programs ;; @@ -28,17 +28,9 @@ diff -Naur yaml-0.1.4-orig/aclocal.m4 yaml-0.1.4/aclocal.m4 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}`~ -@@ -2245,6 +2245,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" +@@ -2394,6 +2394,11 @@ + 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' @@ -48,7 +40,25 @@ diff -Naur yaml-0.1.4-orig/aclocal.m4 yaml-0.1.4/aclocal.m4 mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -@@ -3016,7 +3021,7 @@ +@@ -2428,7 +2433,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... +@@ -3169,7 +3174,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 +@@ -3225,7 +3230,7 @@ lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -57,16 +67,25 @@ diff -Naur yaml-0.1.4-orig/aclocal.m4 yaml-0.1.4/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' -@@ -3283,7 +3288,7 @@ +@@ -3531,7 +3536,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 +@@ -3586,7 +3591,7 @@ [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+*-*-beos* | *-*-cygwin* | *-*-msys* | *-*-pw32* | *-*-darwin*) +-*-*-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*) -@@ -3352,7 +3357,7 @@ +@@ -3661,7 +3666,7 @@ aix*) symcode='[[BCDT]]' ;; @@ -75,7 +94,7 @@ diff -Naur yaml-0.1.4-orig/aclocal.m4 yaml-0.1.4/aclocal.m4 symcode='[[ABCDGISTW]]' ;; hpux*) -@@ -3598,7 +3603,7 @@ +@@ -3929,7 +3934,7 @@ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; @@ -84,7 +103,16 @@ diff -Naur yaml-0.1.4-orig/aclocal.m4 yaml-0.1.4/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 -@@ -3905,7 +3910,7 @@ +@@ -4000,7 +4005,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], [], +@@ -4247,7 +4252,7 @@ # PIC is the default for these OSes. ;; @@ -93,7 +121,7 @@ diff -Naur yaml-0.1.4-orig/aclocal.m4 yaml-0.1.4/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 -@@ -3975,7 +3980,7 @@ +@@ -4332,7 +4337,7 @@ fi ;; @@ -102,16 +130,16 @@ diff -Naur yaml-0.1.4-orig/aclocal.m4 yaml-0.1.4/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], [], -@@ -4206,7 +4211,7 @@ +@@ -4592,7 +4597,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' - ;; - linux* | k*bsd*-gnu) -@@ -4261,7 +4266,7 @@ + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' +@@ -4653,7 +4658,7 @@ extract_expsyms_cmds= case $host_os in @@ -120,7 +148,7 @@ diff -Naur yaml-0.1.4-orig/aclocal.m4 yaml-0.1.4/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++. -@@ -4352,7 +4357,7 @@ +@@ -4771,7 +4776,7 @@ fi ;; @@ -129,7 +157,7 @@ diff -Naur yaml-0.1.4-orig/aclocal.m4 yaml-0.1.4/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' -@@ -4708,7 +4713,7 @@ +@@ -5145,7 +5150,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; @@ -138,38 +166,52 @@ diff -Naur yaml-0.1.4-orig/aclocal.m4 yaml-0.1.4/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 -@@ -5652,7 +5657,7 @@ +@@ -6142,7 +6147,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' -@@ -7505,7 +7510,7 @@ + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC +@@ -7945,7 +7950,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 +@@ -7953,12 +7958,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 +@@ -8121,7 +8126,7 @@ [enable_win32_dll=yes case $host in --*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) -+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-cegcc*) +-*-*-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 yaml-0.1.4-orig/config/config.guess yaml-0.1.4/config/config.guess ---- yaml-0.1.4-orig/config/config.guess 2011-05-31 05:59:42.000000000 +0400 -+++ yaml-0.1.4/config/config.guess 2013-07-23 10:20:02.093750000 +0400 -@@ -801,6 +801,9 @@ - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -@@ -841,6 +844,9 @@ +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 @@ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; @@ -179,23 +221,11 @@ diff -Naur yaml-0.1.4-orig/config/config.guess yaml-0.1.4/config/config.guess p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit ;; -diff -Naur yaml-0.1.4-orig/config/config.sub yaml-0.1.4/config/config.sub ---- yaml-0.1.4-orig/config/config.sub 2011-05-31 05:59:42.000000000 +0400 -+++ yaml-0.1.4/config/config.sub 2013-07-23 10:15:00.781250000 +0400 -@@ -1300,7 +1300,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 yaml-0.1.4-orig/config/ltmain.sh yaml-0.1.4/config/ltmain.sh ---- yaml-0.1.4-orig/config/ltmain.sh 2011-05-31 05:59:39.000000000 +0400 -+++ yaml-0.1.4/config/ltmain.sh 2013-07-23 10:18:59.812500000 +0400 -@@ -805,7 +805,7 @@ - +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*) @@ -203,7 +233,7 @@ diff -Naur yaml-0.1.4-orig/config/ltmain.sh yaml-0.1.4/config/ltmain.sh # don't eliminate duplications in $postdeps and $predeps opt_duplicate_compiler_generated_deps=: ;; -@@ -1276,7 +1276,7 @@ +@@ -2123,7 +2123,7 @@ # On Cygwin there's no "real" PIC flag so we must build both object types case $host_os in @@ -212,7 +242,7 @@ diff -Naur yaml-0.1.4-orig/config/ltmain.sh yaml-0.1.4/config/ltmain.sh pic_mode=default ;; esac -@@ -2047,7 +2047,7 @@ +@@ -2992,7 +2992,7 @@ 'exit $?' tstripme="$stripme" case $host_os in @@ -221,7 +251,7 @@ diff -Naur yaml-0.1.4-orig/config/ltmain.sh yaml-0.1.4/config/ltmain.sh case $realname in *.dll.a) tstripme="" -@@ -2153,7 +2153,7 @@ +@@ -3098,7 +3098,7 @@ # Do a test to see if this is really a libtool program. case $host in @@ -230,16 +260,16 @@ diff -Naur yaml-0.1.4-orig/config/ltmain.sh yaml-0.1.4/config/ltmain.sh if func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" wrapper=$func_ltwrapper_scriptname_result -@@ -2228,7 +2228,7 @@ +@@ -3173,7 +3173,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 -@@ -2359,7 +2359,7 @@ +@@ -3323,7 +3323,7 @@ $RM $export_symbols eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in @@ -248,61 +278,43 @@ diff -Naur yaml-0.1.4-orig/config/ltmain.sh yaml-0.1.4/config/ltmain.sh eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ;; -@@ -2371,7 +2371,7 @@ +@@ -3335,7 +3335,7 @@ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in -- *cygwin | *mingw* | *cegcc* ) -+ *cygwin | *msys | *mingw* | *cegcc* ) +- *cygwin* | *mingw* | *cegcc* ) ++ *cygwin* | *msys* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; -@@ -2427,7 +2427,7 @@ - } lt_dlsymlist; - " - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - $ECHO >> "$output_objdir/$my_dlsyms" "\ - /* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation -@@ -2513,7 +2513,7 @@ +@@ -3349,7 +3349,7 @@ + func_basename "$dlprefile" + 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 @@ # Transform the symbol file into the correct name. 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 "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -@@ -2991,7 +2991,7 @@ - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; -- *cygwin* ) -+ *cygwin* | *msys* ) - func_to_host_path_tmp1=`cygpath -w "$1"` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` -@@ -3070,7 +3070,7 @@ - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; -- *cygwin* ) -+ *cygwin* | *msys* ) - func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` -@@ -3384,7 +3384,7 @@ + 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 @@ { EOF case "$host" in - *mingw* | *cygwin* ) -+ *mingw* | *cygwin* | *msys* ) ++ *mingw* | *cygwin* | *msys*) # make stdout use "unix" line endings echo " setmode(1,_O_BINARY);" ;; -@@ -4033,7 +4033,7 @@ +@@ -5094,7 +5094,7 @@ { $opt_debug case $host in @@ -311,25 +323,25 @@ diff -Naur yaml-0.1.4-orig/config/ltmain.sh yaml-0.1.4/config/ltmain.sh # 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 -@@ -4502,7 +4502,7 @@ +@@ -5581,7 +5581,7 @@ ;; esac case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; -@@ -4522,7 +4522,7 @@ +@@ -5601,7 +5601,7 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) +- *-*-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 ;; -@@ -4599,7 +4599,7 @@ +@@ -5679,7 +5679,7 @@ -no-install) case $host in @@ -338,34 +350,43 @@ diff -Naur yaml-0.1.4-orig/config/ltmain.sh yaml-0.1.4/config/ltmain.sh # 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" -@@ -5559,7 +5559,7 @@ +@@ -6548,7 +6548,7 @@ + fi + 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 @@ if test -n "$library_names" && { test "$use_static_libs" = no || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *msys* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded - notinst_deplibs="$notinst_deplibs $lib" + func_append notinst_deplibs " $lib" need_relink=no -@@ -5629,7 +5629,7 @@ +@@ -6762,7 +6762,7 @@ elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) -+ *cygwin* | *msys* | mingw* | *cegcc*) ++ *cygwin* | *msys* | *mingw* | *cegcc*) func_arith $current - $age major=$func_arith_result versuffix="-$major" -@@ -6483,7 +6483,7 @@ +@@ -7626,7 +7626,7 @@ if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) ++ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) -@@ -6982,7 +6982,7 @@ +@@ -8140,7 +8140,7 @@ orig_export_symbols= case $host_os in @@ -374,7 +395,7 @@ diff -Naur yaml-0.1.4-orig/config/ltmain.sh yaml-0.1.4/config/ltmain.sh 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 -@@ -7494,7 +7494,7 @@ +@@ -8696,7 +8696,7 @@ prog) case $host in @@ -383,7 +404,7 @@ diff -Naur yaml-0.1.4-orig/config/ltmain.sh yaml-0.1.4/config/ltmain.sh output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ -@@ -7607,7 +7607,7 @@ +@@ -8809,7 +8809,7 @@ esac fi case $host in @@ -392,16 +413,16 @@ diff -Naur yaml-0.1.4-orig/config/ltmain.sh yaml-0.1.4/config/ltmain.sh testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; -@@ -7681,7 +7681,7 @@ - - wrappers_required=yes - case $host in +@@ -8887,7 +8887,7 @@ + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=no + ;; - *cygwin* | *mingw* ) + *cygwin* | *msys* | *mingw* ) if test "$build_libtool_libs" != yes; then wrappers_required=no fi -@@ -7824,14 +7824,14 @@ +@@ -9034,14 +9034,14 @@ esac # test for cygwin because mv fails w/o .exe extensions case $host in @@ -418,19 +439,19 @@ diff -Naur yaml-0.1.4-orig/config/ltmain.sh yaml-0.1.4/config/ltmain.sh func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result -@@ -8130,7 +8130,7 @@ - # place dlname in correct position for cygwin +@@ -9371,7 +9371,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) tdlname=../bin/$dlname ;; -+ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $ECHO > $output "\ - # $outputname - a libtool library file -diff -Naur yaml-0.1.4-orig/configure yaml-0.1.4/configure ---- yaml-0.1.4-orig/configure 2011-05-31 05:59:41.000000000 +0400 -+++ yaml-0.1.4/configure 2013-07-23 10:14:25.750000000 +0400 -@@ -4776,7 +4776,7 @@ +- *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 +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 @@ lt_cv_sys_max_cmd_len=-1; ;; @@ -439,7 +460,40 @@ diff -Naur yaml-0.1.4-orig/configure yaml-0.1.4/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, -@@ -5113,7 +5113,7 @@ +@@ -5109,7 +5109,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 +@@ -5117,12 +5117,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 +@@ -5188,7 +5188,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 +@@ -5346,7 +5346,7 @@ lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -448,7 +502,16 @@ diff -Naur yaml-0.1.4-orig/configure yaml-0.1.4/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' -@@ -5676,7 +5676,7 @@ +@@ -5663,7 +5663,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 +@@ -6156,7 +6156,7 @@ aix*) symcode='[BCDT]' ;; @@ -457,7 +520,7 @@ diff -Naur yaml-0.1.4-orig/configure yaml-0.1.4/configure symcode='[ABCDGISTW]' ;; hpux*) -@@ -7396,7 +7396,7 @@ +@@ -8118,7 +8118,7 @@ # PIC is the default for these OSes. ;; @@ -466,7 +529,7 @@ diff -Naur yaml-0.1.4-orig/configure yaml-0.1.4/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 -@@ -7465,7 +7465,7 @@ +@@ -8202,7 +8202,7 @@ fi ;; @@ -475,7 +538,7 @@ diff -Naur yaml-0.1.4-orig/configure yaml-0.1.4/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' -@@ -7927,7 +7927,7 @@ +@@ -8693,7 +8693,7 @@ extract_expsyms_cmds= case $host_os in @@ -484,7 +547,7 @@ diff -Naur yaml-0.1.4-orig/configure yaml-0.1.4/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++. -@@ -8018,7 +8018,7 @@ +@@ -8811,7 +8811,7 @@ fi ;; @@ -493,7 +556,7 @@ diff -Naur yaml-0.1.4-orig/configure yaml-0.1.4/configure # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' -@@ -8432,7 +8432,7 @@ +@@ -9269,7 +9269,7 @@ export_dynamic_flag_spec=-rdynamic ;; @@ -502,7 +565,7 @@ diff -Naur yaml-0.1.4-orig/configure yaml-0.1.4/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 -@@ -9275,14 +9275,14 @@ +@@ -10222,7 +10222,7 @@ # libtool to hard-code these into programs ;; @@ -511,17 +574,9 @@ diff -Naur yaml-0.1.4-orig/configure yaml-0.1.4/configure version_type=windows shrext_cmds=".dll" need_version=no - need_lib_prefix=no +@@ -10254,6 +10254,11 @@ - 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}`~ -@@ -9305,6 +9305,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" + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; + msys*) + # MSYS DLLs use 'msys-' prefix rather than 'lib' @@ -531,7 +586,16 @@ diff -Naur yaml-0.1.4-orig/configure yaml-0.1.4/configure mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -@@ -9940,7 +9945,7 @@ +@@ -10288,7 +10293,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... +@@ -10950,7 +10955,7 @@ lt_cv_dlopen_libs= ;;