Similar to https://github.com/Alexpux/MINGW-packages/pull/2878 this adjusts the pkgbase names of all packages to match the directory name the PKGBUILD is in. The motivation for this is to provide links to PKGBUILD sources and git history from the web interface. The "dwz" directory is deleted as it just contains an older copy of the elfutils PKGBUILD (elfutils isn't in the repo)
607 lines
21 KiB
Diff
607 lines
21 KiB
Diff
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;
|
|
;;
|
|
|
|
- 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,
|
|
@@ -1891,7 +1891,7 @@
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -2362,7 +2362,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -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'
|
|
+ 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}'
|
|
@@ -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
|
|
;;
|
|
|
|
-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'
|
|
@@ -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* | *-*-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*)
|
|
@@ -3661,7 +3666,7 @@
|
|
aix*)
|
|
symcode='[[BCDT]]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[[ABCDGISTW]]'
|
|
;;
|
|
hpux*)
|
|
@@ -3929,7 +3934,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
|
|
@@ -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.
|
|
;;
|
|
|
|
- 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
|
|
@@ -4332,7 +4337,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], [],
|
|
@@ -4592,7 +4597,7 @@
|
|
pw32*)
|
|
_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
|
|
;;
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
case $cc_basename in
|
|
cl*)
|
|
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
|
|
@@ -4653,7 +4658,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++.
|
|
@@ -4771,7 +4776,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'
|
|
@@ -5145,7 +5150,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
|
|
@@ -6142,7 +6147,7 @@
|
|
esac
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
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*)
|
|
AC_CHECK_TOOL(AS, as, false)
|
|
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
|
AC_CHECK_TOOL(OBJDUMP, objdump, false)
|
|
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 ;;
|
|
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
|
|
+ echo x86_64-unknown-msys
|
|
+ exit ;;
|
|
p*:CYGWIN*:*)
|
|
echo powerpcle-unknown-cygwin
|
|
exit ;;
|
|
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 @@
|
|
|
|
# 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
|
|
@@ -2992,7 +2992,7 @@
|
|
'exit $?'
|
|
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 @@
|
|
|
|
# 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
|
|
@@ -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*)
|
|
case $file:$destfile in
|
|
*.exe:*.exe)
|
|
# this is ok
|
|
@@ -3323,7 +3323,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"'
|
|
;;
|
|
@@ -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* )
|
|
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
|
|
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
|
|
;;
|
|
@@ -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 "$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*)
|
|
# make stdout use "unix" line endings
|
|
echo " setmode(1,_O_BINARY);"
|
|
;;
|
|
@@ -5094,7 +5094,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
|
|
@@ -5581,7 +5581,7 @@
|
|
;;
|
|
esac
|
|
case $host in
|
|
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
|
testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
|
|
case :$dllsearchpath: in
|
|
*":$dir:"*) ;;
|
|
@@ -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* | *-*-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 @@
|
|
|
|
-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"
|
|
@@ -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
|
|
func_append notinst_deplibs " $lib"
|
|
need_relink=no
|
|
@@ -6762,7 +6762,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"
|
|
@@ -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* | *-*-haiku*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
|
|
# these systems don't actually have a c library (as such)!
|
|
;;
|
|
*-*-rhapsody* | *-*-darwin1.[012])
|
|
@@ -8140,7 +8140,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
|
|
@@ -8696,7 +8696,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" && \
|
|
@@ -8809,7 +8809,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:"*) ;;
|
|
@@ -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
|
|
@@ -9034,14 +9034,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
|
|
@@ -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)
|
|
+ *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;
|
|
;;
|
|
|
|
- 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,
|
|
@@ -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
|
|
;;
|
|
|
|
-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'
|
|
@@ -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]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -8118,7 +8118,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
|
|
@@ -8202,7 +8202,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'
|
|
@@ -8693,7 +8693,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++.
|
|
@@ -8811,7 +8811,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'
|
|
@@ -9269,7 +9269,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
|
|
@@ -10222,7 +10222,7 @@
|
|
# libtool to hard-code these into programs
|
|
;;
|
|
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
version_type=windows
|
|
shrext_cmds=".dll"
|
|
need_version=no
|
|
@@ -10254,6 +10254,11 @@
|
|
|
|
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
|
|
;;
|
|
+ msys*)
|
|
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
|
|
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+ 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}'
|
|
@@ -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=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|