543 lines
20 KiB
Diff
543 lines
20 KiB
Diff
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 @@
|
|
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,
|
|
@@ -1758,7 +1758,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -2215,14 +2215,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}`~
|
|
@@ -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"
|
|
;;
|
|
+ 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}'
|
|
@@ -3016,7 +3021,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'
|
|
@@ -3283,7 +3288,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*)
|
|
@@ -3352,7 +3357,7 @@
|
|
aix*)
|
|
symcode='[[BCDT]]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[[ABCDGISTW]]'
|
|
;;
|
|
hpux*)
|
|
@@ -3598,7 +3603,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
|
|
@@ -3905,7 +3910,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
|
|
@@ -3975,7 +3980,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], [],
|
|
@@ -4206,7 +4211,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 @@
|
|
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++.
|
|
@@ -4352,7 +4357,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'
|
|
@@ -4708,7 +4713,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
|
|
@@ -5652,7 +5657,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 @@
|
|
[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 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 @@
|
|
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 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 @@
|
|
|
|
|
|
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=:
|
|
;;
|
|
@@ -1276,7 +1276,7 @@
|
|
|
|
# On Cygwin there's no "real" PIC flag so we must build both object types
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | os2* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | os2* | cegcc*)
|
|
pic_mode=default
|
|
;;
|
|
esac
|
|
@@ -2047,7 +2047,7 @@
|
|
'exit $?'
|
|
tstripme="$stripme"
|
|
case $host_os in
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
case $realname in
|
|
*.dll.a)
|
|
tstripme=""
|
|
@@ -2153,7 +2153,7 @@
|
|
|
|
# Do a test to see if this is really a libtool program.
|
|
case $host in
|
|
- *cygwin* | *mingw*)
|
|
+ *cygwin* | *msys* | *mingw*)
|
|
if func_ltwrapper_executable_p "$file"; then
|
|
func_ltwrapper_scriptname "$file"
|
|
wrapper=$func_ltwrapper_scriptname_result
|
|
@@ -2228,7 +2228,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*)
|
|
case $file:$destfile in
|
|
*.exe:*.exe)
|
|
# this is ok
|
|
@@ -2359,7 +2359,7 @@
|
|
$RM $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"'
|
|
;;
|
|
@@ -2371,7 +2371,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* )
|
|
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 @@
|
|
# 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 @@
|
|
{
|
|
EOF
|
|
case "$host" in
|
|
- *mingw* | *cygwin* )
|
|
+ *mingw* | *cygwin* | *msys* )
|
|
# make stdout use "unix" line endings
|
|
echo " setmode(1,_O_BINARY);"
|
|
;;
|
|
@@ -4033,7 +4033,7 @@
|
|
{
|
|
$opt_debug
|
|
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
|
|
@@ -4502,7 +4502,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*'`
|
|
case :$dllsearchpath: in
|
|
*":$dir:"*) ;;
|
|
@@ -4522,7 +4522,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*)
|
|
# These systems don't actually have a C or math library (as such)
|
|
continue
|
|
;;
|
|
@@ -4599,7 +4599,7 @@
|
|
|
|
-no-install)
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
|
|
+ *-*-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"
|
|
@@ -5559,7 +5559,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"
|
|
need_relink=no
|
|
@@ -5629,7 +5629,7 @@
|
|
elif test -n "$soname_spec"; then
|
|
# bleh windows
|
|
case $host in
|
|
- *cygwin* | mingw* | *cegcc*)
|
|
+ *cygwin* | *msys* | mingw* | *cegcc*)
|
|
func_arith $current - $age
|
|
major=$func_arith_result
|
|
versuffix="-$major"
|
|
@@ -6483,7 +6483,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*)
|
|
# these systems don't actually have a c library (as such)!
|
|
;;
|
|
*-*-rhapsody* | *-*-darwin1.[012])
|
|
@@ -6982,7 +6982,7 @@
|
|
|
|
orig_export_symbols=
|
|
case $host_os in
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ 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
|
|
@@ -7494,7 +7494,7 @@
|
|
|
|
prog)
|
|
case $host in
|
|
- *cygwin*) func_stripname '' '.exe' "$output"
|
|
+ *cygwin* | *msys*) func_stripname '' '.exe' "$output"
|
|
output=$func_stripname_result.exe;;
|
|
esac
|
|
test -n "$vinfo" && \
|
|
@@ -7607,7 +7607,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*'`
|
|
case :$dllsearchpath: in
|
|
*":$libdir:"*) ;;
|
|
@@ -7681,7 +7681,7 @@
|
|
|
|
wrappers_required=yes
|
|
case $host in
|
|
- *cygwin* | *mingw* )
|
|
+ *cygwin* | *msys* | *mingw* )
|
|
if test "$build_libtool_libs" != yes; then
|
|
wrappers_required=no
|
|
fi
|
|
@@ -7824,14 +7824,14 @@
|
|
esac
|
|
# test for cygwin because mv fails w/o .exe extensions
|
|
case $host in
|
|
- *cygwin*)
|
|
+ *cygwin* | *msys*)
|
|
exeext=.exe
|
|
func_stripname '' '.exe' "$outputname"
|
|
outputname=$func_stripname_result ;;
|
|
*) exeext= ;;
|
|
esac
|
|
case $host in
|
|
- *cygwin* | *mingw* )
|
|
+ *cygwin* | *msys* | *mingw* )
|
|
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
|
|
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 @@
|
|
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,
|
|
@@ -5113,7 +5113,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'
|
|
@@ -5676,7 +5676,7 @@
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -7396,7 +7396,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
|
|
@@ -7465,7 +7465,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).
|
|
lt_prog_compiler_pic='-DDLL_EXPORT'
|
|
@@ -7927,7 +7927,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++.
|
|
@@ -8018,7 +8018,7 @@
|
|
fi
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _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 @@
|
|
export_dynamic_flag_spec=-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
|
|
@@ -9275,14 +9275,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}`~
|
|
@@ -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"
|
|
;;
|
|
+ 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}'
|
|
@@ -9940,7 +9945,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|