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

libtool: sync patches from msys libtool

Browse Source
This commit is contained in:
Christoph Reiter 2025-09-22 19:45:57 +02:00
parent c9d1d57805
commit e8178ad298
2 changed files with 56 additions and 524 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

576
mingw-w64-libtool/0007-msysize.patch
View File

@ -1,531 +1,63 @@
[PATCH] msysize
---
build-aux/ltmain.in | 50 ++++++++++++++++++++++----------------------
m4/libtool.m4 | 48 +++++++++++++++++++++---------------------
m4/ltargz.m4 | 2 +-
m4/ltdl.m4 | 2 +-
m4/ltoptions.m4 | 2 +-
tests/bindir.at | 4 ++--
tests/bug_62343.at | 2 +-
tests/lt_dladvise.at | 2 +-
8 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 0560159b..860c6a09 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -521,7 +521,7 @@ libtool_validate_options ()
diff -Nur libtool-2.5.4.orig/configure libtool-2.5.4/configure
--- libtool-2.5.4.orig/configure 2025-06-10 08:17:21.269872200 +0200
+++ libtool-2.5.4/configure 2025-06-10 08:18:07.824248200 +0200
@@ -13566,7 +13566,7 @@
case $host_os 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* | windows* | pw32* | cegcc* | solaris2* | os2*)
+ cygwin* | msys* | mingw* | windows* | pw32* | cegcc* | solaris2* | os2*)
# don't eliminate duplications in $postdeps and $predeps
opt_duplicate_compiler_generated_deps=:
;;
@@ -1543,7 +1543,7 @@ func_mode_compile ()
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
- cygwin* | mingw* | windows* | pw32* | os2* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | pw32* | os2* | cegcc*)
pic_mode=default
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
esac
@@ -2420,7 +2420,7 @@ func_mode_install ()
'exit $?'
tstripme=$stripme
case $host_os in
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
case $realname in
*.dll.a)
tstripme=
@@ -2533,7 +2533,7 @@ func_mode_install ()
# Do a test to see if this is really a libtool program.
case $host in
- *cygwin* | *mingw* | *windows*)
+ *cygwin* | *msys* | *mingw* | *windows*)
if func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
wrapper=$func_ltwrapper_scriptname_result
@@ -2608,7 +2608,7 @@ func_mode_install ()
# 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
@@ -2761,7 +2761,7 @@ extern \"C\" {
$RM $export_symbols
eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *windows* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
;;
@@ -2773,7 +2773,7 @@ extern \"C\" {
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *windows* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@ -2787,7 +2787,7 @@ extern \"C\" {
func_basename "$dlprefile"
name=$func_basename_result
case $host in
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *windows* | *cegcc* )
# if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile"
@@ -2970,7 +2970,7 @@ static const void *lt_preloaded_setup() {
# Transform the symbol file into the correct name.
symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *windows* | *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%"`
@@ -3870,7 +3870,7 @@ main (int argc, char *argv[])
{
EOF
case $host in
- *mingw* | *windows* | *cygwin* )
+ *mingw* | *windows* | *cygwin* | *msys* )
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
;;
@@ -4644,7 +4644,7 @@ func_mode_link ()
$debug_cmd
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
# what system we are compiling for in order to pass an extra
@@ -5152,7 +5152,7 @@ func_mode_link ()
;;
esac
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
@@ -5172,7 +5172,7 @@ func_mode_link ()
-l*)
if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -5267,7 +5267,7 @@ func_mode_link ()
-no-install)
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-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"
@@ -6198,7 +6198,7 @@ func_mode_link ()
fi
case $host in
# special handling for platforms with PE-DLLs.
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *windows* | *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
@@ -6347,7 +6347,7 @@ func_mode_link ()
if test -n "$library_names" &&
{ test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host_os in
- cygwin* | mingw* | windows* | cegcc* | os2*)
+ cygwin* | msys* | mingw* | windows* | cegcc* | os2*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
@@ -6419,7 +6419,7 @@ func_mode_link ()
elif test -n "$soname_spec"; then
# bleh windows
case $host_os in
- cygwin* | mingw* | windows* | cegcc* | os2*)
+ cygwin* | msys* | mingw* | windows* | cegcc* | os2*)
func_arith $current - $age
major=$func_arith_result
versuffix=-$major
@@ -7333,7 +7333,7 @@ func_mode_link ()
if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
@@ -7750,7 +7750,7 @@ func_mode_link ()
orig_export_symbols=
case $host_os in
- cygwin* | mingw* | windows* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
func_dll_def_p "$export_symbols" || {
@@ -8309,7 +8309,7 @@ func_mode_link ()
prog)
case $host in
- *cygwin*) func_stripname '' '.exe' "$output"
+ *cygwin* | *msys*) func_stripname '' '.exe' "$output"
output=$func_stripname_result.exe;;
esac
test -n "$vinfo" && \
@@ -8420,7 +8420,7 @@ func_mode_link ()
esac
fi
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
@@ -8498,7 +8498,7 @@ func_mode_link ()
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
wrappers_required=false
;;
- *cygwin* | *mingw* | *windows* )
+ *cygwin* | *msys* | *mingw* | *windows* )
test yes = "$build_libtool_libs" || wrappers_required=false
;;
*)
@@ -8645,14 +8645,14 @@ func_mode_link ()
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* | windows* )
+ *cygwin* | *msys* | *mingw* | windows* )
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
@@ -8996,7 +8996,7 @@ func_mode_link ()
# 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 | *windows*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *windows*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there.
if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir"
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index e5ddacee..93a54713 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1717,7 +1717,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=-1;
;;
- cygwin* | mingw* | windows* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | 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,
@@ -1965,7 +1965,7 @@ else
lt_cv_dlopen_libs=
;;
- cygwin*)
+ cygwin* | msys*)
lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
@@ -2555,7 +2555,7 @@ bsdi[[45]]*)
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | windows* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
version_type=windows
shrext_cmds=.dll
need_version=no
@@ -2595,9 +2595,9 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
shlibpath_overrides_runpath=yes
@@ -19822,7 +19822,7 @@
case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
mingw* | windows* | cegcc*)
@@ -23635,7 +23635,7 @@
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
mingw* | windows* | cegcc*)
@@ -27600,7 +27600,7 @@
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
mingw* | windows* | cegcc*)
diff -Nur libtool-2.5.4.orig/libltdl/configure libtool-2.5.4/libltdl/configure
--- libtool-2.5.4.orig/libltdl/configure 2025-06-10 08:17:21.237899700 +0200
+++ libtool-2.5.4/libltdl/configure 2025-06-10 08:18:14.340828300 +0200
@@ -12001,7 +12001,7 @@
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
diff -Nur libtool-2.5.4.orig/m4/libtool.m4 libtool-2.5.4/m4/libtool.m4
--- libtool-2.5.4.orig/m4/libtool.m4 2025-06-10 08:17:21.269872200 +0200
+++ libtool-2.5.4/m4/libtool.m4 2025-06-10 08:17:49.112292900 +0200
@@ -2612,7 +2612,7 @@
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+ cygwin* | 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'
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
@@ -2635,7 +2635,7 @@ m4_if([$1], [],[
# 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...
@@ -3428,7 +3428,7 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
if test yes != "$GCC"; then
reload_cmds=false
fi
@@ -3520,7 +3520,7 @@ bsdi[[45]]*)
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'
@@ -3833,7 +3833,7 @@ lt_cv_sharedlib_from_linklib_cmd,
[lt_cv_sharedlib_from_linklib_cmd='unknown'
case $host_os in
-cygwin* | mingw* | windows* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
# two different shell functions defined in ltmain.sh;
# decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
@@ -3903,7 +3903,7 @@ AC_DEFUN([LT_LIB_M],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -3978,7 +3978,7 @@ case $host_os in
aix*)
symcode='[[BCDT]]'
;;
-cygwin* | mingw* | windows* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]'
;;
hpux*)
@@ -4284,7 +4284,7 @@ m4_if([$1], [CXX], [
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | windows* | 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
@@ -4360,7 +4360,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | windows* | 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], [],
@@ -4608,7 +4608,7 @@ m4_if([$1], [CXX], [
# PIC is the default for these OSes.
;;
- mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | windows* | 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
@@ -4712,7 +4712,7 @@ m4_if([$1], [CXX], [
esac
;;
- mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | windows* | 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], [],
@@ -4993,7 +4993,7 @@ m4_if([$1], [CXX], [
pw32*)
_LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
;;
- cygwin* | mingw* | windows* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | cegcc*)
case $cc_basename in
cl* | icl*)
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
@@ -5051,7 +5051,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds=
case $host_os in
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
# FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++ or Intel C++ Compiler.
@@ -5166,7 +5166,7 @@ _LT_EOF
fi
;;
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | 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'
@@ -5623,7 +5623,7 @@ _LT_EOF
_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++ or Intel C++ Compiler.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -6698,7 +6698,7 @@ if test yes != "$_lt_caught_CXX_error"; then
esac
;;
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
case $GXX,$cc_basename in
,cl* | no,cl* | ,icl* | no,icl*)
# Native MSVC or ICC
@@ -8329,7 +8329,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd,
*-*-mingw* | *-*-windows* ) # 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
@@ -8337,12 +8337,12 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd,
;;
esac
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
case $build in
*-*-mingw* | *-*-windows* ) # 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
diff --git a/m4/ltargz.m4 b/m4/ltargz.m4
index b93c2824..63b8c9be 100644
--- a/m4/ltargz.m4
+++ b/m4/ltargz.m4
@@ -43,7 +43,7 @@ AS_IF([test -z "$LT_ARGZ_H"],
[if argz actually works],
[lt_cv_sys_argz_works],
[[case $host_os in #(
- *cygwin*)
+ *cygwin* | msys*)
lt_cv_sys_argz_works=no
if test no != "$cross_compiling"; then
lt_cv_sys_argz_works="guessing no"
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index c47bb98c..69e56b0c 100644
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -710,7 +710,7 @@ darwin[[1567]].*)
beos*)
LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
;;
-cygwin* | mingw* | windows* | pw32*)
+cygwin* | msys* | mingw* | windows* | pw32*)
AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]])
LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
;;
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 25caa890..e70908de 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -128,7 +128,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
diff --git a/tests/bindir.at b/tests/bindir.at
index 6144e7db..cf6188d6 100644
--- a/tests/bindir.at
+++ b/tests/bindir.at
@@ -62,7 +62,7 @@ AT_SETUP([bindir basic lib test])
bindirneeded=:
case $host_os in
- cygwin*|mingw*|windows*|cegcc*)
+ cygwin*|msys*|mingw*|windows*|cegcc*)
;;
*)
bindirneeded=false
@@ -171,7 +171,7 @@ AT_SETUP([bindir install tests])
bindirneeded=:
case $host_os in
- cygwin*|mingw*|windows*|cegcc*)
+ cygwin*|msys*|mingw*|windows*|cegcc*)
;;
*)
bindirneeded=false
diff --git a/tests/bug_62343.at b/tests/bug_62343.at
index 06a98efc..48d54211 100644
--- a/tests/bug_62343.at
+++ b/tests/bug_62343.at
@@ -53,7 +53,7 @@ AT_CHECK([$GREP -- '-no-canonical-prefixes' stdout], [0], [ignore])
host_flags=:
case $host_os in
- cygwin* | mingw* | windows*)
+ cygwin* | msys* | mingw* | windows*)
host_flags=-no-undefined
;;
*)
diff --git a/tests/lt_dladvise.at b/tests/lt_dladvise.at
index 4be6ad38..c8c58177 100644
--- a/tests/lt_dladvise.at
+++ b/tests/lt_dladvise.at
@@ -330,7 +330,7 @@ have_shared=false
$LIBTOOL --features | $GREP 'enable shared libraries' >/dev/null && have_shared=:
case $host_os,$have_shared in
-cygwin* | mingw* | windows* | cegcc* | *,false)
+cygwin* | msys* | mingw* | windows* | cegcc* | *,false)
# These hosts do not support linking without -no-undefined
CPPFLAGS="$CPPFLAGS -DHAVE_UNDEFINED_SYMBOLS=0"
;;

4
mingw-w64-libtool/PKGBUILD
View File

@ -5,7 +5,7 @@ _realname=libtool
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-libtool" "${MINGW_PACKAGE_PREFIX}-libltdl")
pkgver=2.5.4
pkgrel=2
pkgrel=3
pkgdesc="A generic library support script (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@ -40,7 +40,7 @@ sha256sums=('f81f5860666b0bc7d84baddefa60d1cb9fa6fceb2398cc3baca6afaa60266675'
'96538c6cb843f8673f4db8199402b4b02d9477d71c86df5f5e94e3e4d1347b54'
'0dd70a4f955ed4cd94a0d13b784b7db7dddbd4d1d6ee5b092202f8b9496fd3eb'
'2cb1b61247a4632698ac7e26c496c3ad8c1b4fde080d301994dbddc0794a4bf4'
'acec8e76b0d65c7b5f442203b2446d92a2f81ceaaa211cd2e6b8a036f5115280'
'fca5986c0010b202ee65c69939815269bd46b3ce948d9222916985652da7e2af'
'de68dc9387f47ee129f55b2f525a7d222374ddd8915f4f42af05f185b779b826'
'8069e887aeeab7491f15e00547fa66d9b9e86407f5a23f37a6d8c7d165de752e'
'e62e836f018339974f5ef7cf81bc0a4252901158eb0824eb62d0270206093ad7')