0009-libtool-2.4.2.418-msysize.patch (51364B)
1 diff -urN libtool-2.4.7/build-aux/config.guess.orig libtool-2.4.7/build-aux/config.guess 2 --- libtool-2.4.7/build-aux/config.guess.orig 2022-05-25 14:18:47.388587800 +0200 3 +++ libtool-2.4.7/build-aux/config.guess 2022-05-25 14:21:50.720326000 +0200 4 @@ -950,6 +950,9 @@ 5 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) 6 GUESS=x86_64-pc-cygwin 7 ;; 8 + amd64:MSYS*:*:* | x86_64:MSYS*:*:*) 9 + GUESS=x86_64-pc-msys 10 + ;; 11 prep*:SunOS:5.*:*) 12 SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` 13 GUESS=powerpcle-unknown-solaris2$SUN_REL 14 15 diff -Naur libtool-2.4.3-orig/build-aux/ltmain.in libtool-2.4.3/build-aux/ltmain.in 16 --- libtool-2.4.3-orig/build-aux/ltmain.in 2014-09-02 09:54:56.481600000 +0400 17 +++ libtool-2.4.3/build-aux/ltmain.in 2014-09-02 10:14:04.809600000 +0400 18 @@ -497,7 +497,7 @@ 19 case $host in 20 # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 21 # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 22 - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) 23 + *cygwin* | *msys* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) 24 # don't eliminate duplications in $postdeps and $predeps 25 opt_duplicate_compiler_generated_deps=: 26 ;; 27 @@ -1510,7 +1510,7 @@ 28 29 # On Cygwin there's no "real" PIC flag so we must build both object types 30 case $host_os in 31 - cygwin* | mingw* | pw32* | os2* | cegcc*) 32 + cygwin* | msys* | mingw* | pw32* | os2* | cegcc*) 33 pic_mode=default 34 ;; 35 esac 36 @@ -2383,7 +2383,7 @@ 37 'exit $?' 38 tstripme=$stripme 39 case $host_os in 40 - cygwin* | mingw* | pw32* | cegcc*) 41 + cygwin* | msys* | mingw* | pw32* | cegcc*) 42 case $realname in 43 *.dll.a) 44 tstripme= 45 @@ -2489,7 +2489,7 @@ 46 47 # Do a test to see if this is really a libtool program. 48 case $host in 49 - *cygwin* | *mingw*) 50 + *cygwin* | *msys* | *mingw*) 51 if func_ltwrapper_executable_p "$file"; then 52 func_ltwrapper_scriptname "$file" 53 wrapper=$func_ltwrapper_scriptname_result 54 @@ -2564,7 +2564,7 @@ 55 # remove .exe since cygwin /usr/bin/install will append another 56 # one anyway 57 case $install_prog,$host in 58 - */usr/bin/install*,*cygwin*) 59 + */usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*) 60 case $file:$destfile in 61 *.exe:*.exe) 62 # this is ok 63 @@ -2717,7 +2717,7 @@ 64 $RM $export_symbols 65 eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' 66 case $host in 67 - *cygwin* | *mingw* | *cegcc* ) 68 + *cygwin* | *msys* | *mingw* | *cegcc* ) 69 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' 70 eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' 71 ;; 72 @@ -2729,7 +2729,7 @@ 73 eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' 74 eval '$MV "$nlist"T "$nlist"' 75 case $host in 76 - *cygwin* | *mingw* | *cegcc* ) 77 + *cygwin* | *msys* | *mingw* | *cegcc* ) 78 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' 79 eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' 80 ;; 81 @@ -2743,7 +2743,7 @@ 82 func_basename "$dlprefile" 83 name=$func_basename_result 84 case $host in 85 - *cygwin* | *mingw* | *cegcc* ) 86 + *cygwin* | *msys* | *mingw* | *cegcc* ) 87 # if an import library, we need to obtain dlname 88 if func_win32_import_lib_p "$dlprefile"; then 89 func_tr_sh "$dlprefile" 90 @@ -2918,7 +2918,7 @@ 91 # Transform the symbol file into the correct name. 92 symfileobj=$output_objdir/${my_outputname}S.$objext 93 case $host in 94 - *cygwin* | *mingw* | *cegcc* ) 95 + *cygwin* | *msys* | *mingw* | *cegcc* ) 96 if test -f "$output_objdir/$my_outputname.def"; then 97 compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` 98 finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` 99 @@ -3811,7 +3811,7 @@ 100 { 101 EOF 102 case $host in 103 - *mingw* | *cygwin* ) 104 + *mingw* | *cygwin* | *msys* ) 105 # make stdout use "unix" line endings 106 echo " setmode(1,_O_BINARY);" 107 ;; 108 @@ -4567,7 +4567,7 @@ 109 $debug_cmd 110 111 case $host in 112 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 113 + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 114 # It is impossible to link a dll without this setting, and 115 # we shouldn't force the makefile maintainer to figure out 116 # what system we are compiling for in order to pass an extra 117 @@ -5060,7 +5060,7 @@ 118 ;; 119 esac 120 case $host in 121 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 122 + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 123 testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` 124 case :$dllsearchpath: in 125 *":$dir:"*) ;; 126 @@ -5080,7 +5080,7 @@ 127 -l*) 128 if test X-lc = "X$arg" || test X-lm = "X$arg"; then 129 case $host in 130 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) 131 + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) 132 # These systems don't actually have a C or math library (as such) 133 continue 134 ;; 135 @@ -5163,7 +5163,7 @@ 136 137 -no-install) 138 case $host in 139 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) 140 + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) 141 # The PATH hackery in wrapper scripts is required on Windows 142 # and Darwin in order for the loader to find any dlls it needs. 143 func_warning "'-no-install' is ignored for $host" 144 @@ -6034,7 +6034,7 @@ 145 fi 146 case $host in 147 # special handling for platforms with PE-DLLs. 148 - *cygwin* | *mingw* | *cegcc* ) 149 + *cygwin* | *msys* | *mingw* | *cegcc* ) 150 # Linker will automatically link against shared library if both 151 # static and shared are present. Therefore, ensure we extract 152 # symbols from the import library if a shared library is present 153 @@ -6178,7 +6178,7 @@ 154 if test -n "$library_names" && 155 { test no = "$use_static_libs" || test -z "$old_library"; }; then 156 case $host in 157 - *cygwin* | *mingw* | *cegcc* | *os2*) 158 + *cygwin* | *msys* | *mingw* | *cegcc* | *os2*) 159 # No point in relinking DLLs because paths are not encoded 160 func_append notinst_deplibs " $lib" 161 need_relink=no 162 @@ -6248,7 +6248,7 @@ 163 elif test -n "$soname_spec"; then 164 # bleh windows 165 case $host in 166 - *cygwin* | mingw* | *cegcc* | *os2*) 167 + *cygwin* | *msys* | mingw* | *cegcc* | *os2*) 168 func_arith $current - $age 169 major=$func_arith_result 170 versuffix=-$major 171 @@ -7123,7 +7123,7 @@ 172 if test yes = "$build_libtool_libs"; then 173 if test -n "$rpath"; then 174 case $host in 175 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) 176 + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) 177 # these systems don't actually have a c library (as such)! 178 ;; 179 *-*-rhapsody* | *-*-darwin1.[012]) 180 @@ -7637,7 +7637,7 @@ 181 182 orig_export_symbols= 183 case $host_os in 184 - cygwin* | mingw* | cegcc*) 185 + cygwin* | msys* | mingw* | cegcc*) 186 if test -n "$export_symbols" && test -z "$export_symbols_regex"; then 187 # exporting using user supplied symfile 188 func_dll_def_p "$export_symbols" || { 189 @@ -8194,7 +8194,7 @@ 190 191 prog) 192 case $host in 193 - *cygwin*) func_stripname '' '.exe' "$output" 194 + *cygwin* | *msys*) func_stripname '' '.exe' "$output" 195 output=$func_stripname_result.exe;; 196 esac 197 test -n "$vinfo" && \ 198 @@ -8305,7 +8305,7 @@ 199 esac 200 fi 201 case $host in 202 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 203 + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 204 testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` 205 case :$dllsearchpath: in 206 *":$libdir:"*) ;; 207 @@ -8383,7 +8383,7 @@ 208 # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. 209 wrappers_required=false 210 ;; 211 - *cygwin* | *mingw* ) 212 + *cygwin* | *msys* | *mingw* ) 213 test yes = "$build_libtool_libs" || wrappers_required=false 214 ;; 215 *) 216 @@ -8529,14 +8529,14 @@ 217 esac 218 # test for cygwin because mv fails w/o .exe extensions 219 case $host in 220 - *cygwin*) 221 + *cygwin* | *msys*) 222 exeext=.exe 223 func_stripname '' '.exe' "$outputname" 224 outputname=$func_stripname_result ;; 225 *) exeext= ;; 226 esac 227 case $host in 228 - *cygwin* | *mingw* ) 229 + *cygwin* | *msys* | *mingw* ) 230 func_dirname_and_basename "$output" "" "." 231 output_name=$func_basename_result 232 output_path=$func_dirname_result 233 @@ -8878,7 +8878,7 @@ 234 # tests/bindir.at for full details. 235 tdlname=$dlname 236 case $host,$output,$installed,$module,$dlname in 237 - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) 238 + *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) 239 # If a -bindir argument was supplied, place the dll there. 240 if test -n "$bindir"; then 241 func_relative_path "$install_libdir" "$bindir" 242 243 diff -Naur libtool-2.4.2.418-orig/build-aux/ltmain.sh libtool-2.4.2.418/build-aux/ltmain.sh 244 --- libtool-2.4.2.418-orig/build-aux/ltmain.sh 2013-10-27 02:53:58.000000000 +0400 245 +++ libtool-2.4.2.418/build-aux/ltmain.sh 2014-09-02 10:29:08.840800000 +0400 246 @@ -2315,7 +2315,7 @@ 247 case $host in 248 # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 249 # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 250 - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) 251 + *cygwin* | *msys* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) 252 # don't eliminate duplications in $postdeps and $predeps 253 opt_duplicate_compiler_generated_deps=: 254 ;; 255 @@ -3328,7 +3328,7 @@ 256 257 # On Cygwin there's no "real" PIC flag so we must build both object types 258 case $host_os in 259 - cygwin* | mingw* | pw32* | os2* | cegcc*) 260 + cygwin* | msys* | mingw* | pw32* | os2* | cegcc*) 261 pic_mode=default 262 ;; 263 esac 264 @@ -4201,7 +4201,7 @@ 265 'exit $?' 266 tstripme=$stripme 267 case $host_os in 268 - cygwin* | mingw* | pw32* | cegcc*) 269 + cygwin* | msys* | mingw* | pw32* | cegcc*) 270 case $realname in 271 *.dll.a) 272 tstripme= 273 @@ -4307,7 +4307,7 @@ 274 275 # Do a test to see if this is really a libtool program. 276 case $host in 277 - *cygwin* | *mingw*) 278 + *cygwin* | *msys* | *mingw*) 279 if func_ltwrapper_executable_p "$file"; then 280 func_ltwrapper_scriptname "$file" 281 wrapper=$func_ltwrapper_scriptname_result 282 @@ -4382,7 +4382,7 @@ 283 # remove .exe since cygwin /usr/bin/install will append another 284 # one anyway 285 case $install_prog,$host in 286 - */usr/bin/install*,*cygwin*) 287 + */usr/bin/install*,*cygwin* | */usr/bin/install*,*msys*) 288 case $file:$destfile in 289 *.exe:*.exe) 290 # this is ok 291 @@ -4535,7 +4535,7 @@ 292 $RM $export_symbols 293 eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' 294 case $host in 295 - *cygwin* | *mingw* | *cegcc* ) 296 + *cygwin* | *msys* | *mingw* | *cegcc* ) 297 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' 298 eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' 299 ;; 300 @@ -4547,7 +4547,7 @@ 301 eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' 302 eval '$MV "$nlist"T "$nlist"' 303 case $host in 304 - *cygwin* | *mingw* | *cegcc* ) 305 + *cygwin* | *msys* | *mingw* | *cegcc* ) 306 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' 307 eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' 308 ;; 309 @@ -4561,7 +4561,7 @@ 310 func_basename "$dlprefile" 311 name=$func_basename_result 312 case $host in 313 - *cygwin* | *mingw* | *cegcc* ) 314 + *cygwin* | *msys* | *mingw* | *cegcc* ) 315 # if an import library, we need to obtain dlname 316 if func_win32_import_lib_p "$dlprefile"; then 317 func_tr_sh "$dlprefile" 318 @@ -4736,7 +4736,7 @@ 319 # Transform the symbol file into the correct name. 320 symfileobj=$output_objdir/${my_outputname}S.$objext 321 case $host in 322 - *cygwin* | *mingw* | *cegcc* ) 323 + *cygwin* | *msys* | *mingw* | *cegcc* ) 324 if test -f "$output_objdir/$my_outputname.def"; then 325 compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` 326 finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` 327 @@ -5629,7 +5629,7 @@ 328 { 329 EOF 330 case $host in 331 - *mingw* | *cygwin* ) 332 + *mingw* | *cygwin* | *msys* ) 333 # make stdout use "unix" line endings 334 echo " setmode(1,_O_BINARY);" 335 ;; 336 @@ -6350,7 +6350,7 @@ 337 $debug_cmd 338 339 case $host in 340 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 341 + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 342 # It is impossible to link a dll without this setting, and 343 # we shouldn't force the makefile maintainer to figure out 344 # what system we are compiling for in order to pass an extra 345 @@ -6843,7 +6843,7 @@ 346 ;; 347 esac 348 case $host in 349 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 350 + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 351 testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` 352 case :$dllsearchpath: in 353 *":$dir:"*) ;; 354 @@ -6863,7 +6863,7 @@ 355 -l*) 356 if test X-lc = "X$arg" || test X-lm = "X$arg"; then 357 case $host in 358 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) 359 + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) 360 # These systems don't actually have a C or math library (as such) 361 continue 362 ;; 363 @@ -6946,7 +6946,7 @@ 364 365 -no-install) 366 case $host in 367 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) 368 + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) 369 # The PATH hackery in wrapper scripts is required on Windows 370 # and Darwin in order for the loader to find any dlls it needs. 371 func_warning "'-no-install' is ignored for $host" 372 @@ -7812,7 +7812,7 @@ 373 fi 374 case $host in 375 # special handling for platforms with PE-DLLs. 376 - *cygwin* | *mingw* | *cegcc* ) 377 + *cygwin* | *msys* | *mingw* | *cegcc* ) 378 # Linker will automatically link against shared library if both 379 # static and shared are present. Therefore, ensure we extract 380 # symbols from the import library if a shared library is present 381 @@ -7956,7 +7956,7 @@ 382 if test -n "$library_names" && 383 { test no = "$use_static_libs" || test -z "$old_library"; }; then 384 case $host in 385 - *cygwin* | *mingw* | *cegcc* | *os2*) 386 + *cygwin* | *msys* | *mingw* | *cegcc* | *os2*) 387 # No point in relinking DLLs because paths are not encoded 388 func_append notinst_deplibs " $lib" 389 need_relink=no 390 @@ -8026,7 +8026,7 @@ 391 elif test -n "$soname_spec"; then 392 # bleh windows 393 case $host in 394 - *cygwin* | mingw* | *cegcc* | *os2*) 395 + *cygwin* | *msys* | mingw* | *cegcc* | *os2*) 396 func_arith $current - $age 397 major=$func_arith_result 398 versuffix=-$major 399 @@ -8899,7 +8899,7 @@ 400 if test yes = "$build_libtool_libs"; then 401 if test -n "$rpath"; then 402 case $host in 403 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) 404 + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) 405 # these systems don't actually have a c library (as such)! 406 ;; 407 *-*-rhapsody* | *-*-darwin1.[012]) 408 @@ -9413,7 +9413,7 @@ 409 410 orig_export_symbols= 411 case $host_os in 412 - cygwin* | mingw* | cegcc*) 413 + cygwin* | *msys* | mingw* | cegcc*) 414 if test -n "$export_symbols" && test -z "$export_symbols_regex"; then 415 # exporting using user supplied symfile 416 func_dll_def_p "$export_symbols" || { 417 @@ -9970,7 +9970,7 @@ 418 419 prog) 420 case $host in 421 - *cygwin*) func_stripname '' '.exe' "$output" 422 + *cygwin* | *msys*) func_stripname '' '.exe' "$output" 423 output=$func_stripname_result.exe;; 424 esac 425 test -n "$vinfo" && \ 426 @@ -10081,7 +10081,7 @@ 427 esac 428 fi 429 case $host in 430 - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 431 + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) 432 testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` 433 case :$dllsearchpath: in 434 *":$libdir:"*) ;; 435 @@ -10159,7 +10159,7 @@ 436 # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. 437 wrappers_required=false 438 ;; 439 - *cygwin* | *mingw* ) 440 + *cygwin* | *msys* | *mingw* ) 441 test yes = "$build_libtool_libs" || wrappers_required=false 442 ;; 443 *) 444 @@ -10305,14 +10305,14 @@ 445 esac 446 # test for cygwin because mv fails w/o .exe extensions 447 case $host in 448 - *cygwin*) 449 + *cygwin* | *msys*) 450 exeext=.exe 451 func_stripname '' '.exe' "$outputname" 452 outputname=$func_stripname_result ;; 453 *) exeext= ;; 454 esac 455 case $host in 456 - *cygwin* | *mingw* ) 457 + *cygwin* | *msys* | *mingw* ) 458 func_dirname_and_basename "$output" "" "." 459 output_name=$func_basename_result 460 output_path=$func_dirname_result 461 @@ -10644,7 +10644,7 @@ 462 # tests/bindir.at for full details. 463 tdlname=$dlname 464 case $host,$output,$installed,$module,$dlname in 465 - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) 466 + *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) 467 # If a -bindir argument was supplied, place the dll there. 468 if test -n "$bindir"; then 469 func_relative_path "$install_libdir" "$bindir" 470 --- libtool-2.4.7/configure.orig 2022-05-25 14:05:58.332605400 +0200 471 +++ libtool-2.4.7/configure 2022-05-25 14:11:29.613646200 +0200 472 @@ -5988,7 +5988,7 @@ 473 lt_cv_sys_max_cmd_len=-1; 474 ;; 475 476 - cygwin* | mingw* | cegcc*) 477 + cygwin* | msys* | mingw* | cegcc*) 478 # On Win9x/ME, this test blows up -- it succeeds, but takes 479 # about 5 minutes as the teststring grows exponentially. 480 # Worse, since 9x/ME are not pre-emptively multitasking, 481 @@ -6154,7 +6154,7 @@ 482 *-*-mingw* ) # actually msys 483 lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 484 ;; 485 - *-*-cygwin* ) 486 + *-*-cygwin* | *-*-msys* ) 487 lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 488 ;; 489 * ) # otherwise, assume *nix 490 @@ -6162,12 +6162,12 @@ 491 ;; 492 esac 493 ;; 494 - *-*-cygwin* ) 495 + *-*-cygwin* | *-*-msys* ) 496 case $build in 497 *-*-mingw* ) # actually msys 498 lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 499 ;; 500 - *-*-cygwin* ) 501 + *-*-cygwin* | *-*-msys* ) 502 lt_cv_to_host_file_cmd=func_convert_file_noop 503 ;; 504 * ) # otherwise, assume *nix 505 @@ -6233,7 +6233,7 @@ 506 esac 507 reload_cmds='$LD$reload_flag -o $output$reload_objs' 508 case $host_os in 509 - cygwin* | mingw* | pw32* | cegcc*) 510 + cygwin* | msys* | mingw* | pw32* | cegcc*) 511 if test yes != "$GCC"; then 512 reload_cmds=false 513 fi 514 @@ -6486,7 +6486,7 @@ 515 lt_cv_file_magic_test_file=/shlib/libc.so 516 ;; 517 518 -cygwin*) 519 +cygwin* | msys*) 520 # func_win32_libid is a shell function defined in ltmain.sh 521 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 522 lt_cv_file_magic_cmd='func_win32_libid' 523 @@ -6802,7 +6802,7 @@ 524 lt_cv_sharedlib_from_linklib_cmd='unknown' 525 526 case $host_os in 527 -cygwin* | mingw* | pw32* | cegcc*) 528 +cygwin* | msys* | mingw* | pw32* | cegcc*) 529 # two different shell functions defined in ltmain.sh; 530 # decide which one to use based on capabilities of $DLLTOOL 531 case `$DLLTOOL --help 2>&1` in 532 @@ -7310,7 +7310,7 @@ 533 aix*) 534 symcode='[BCDT]' 535 ;; 536 -cygwin* | mingw* | pw32* | cegcc*) 537 +cygwin* | msys* | mingw* | pw32* | cegcc*) 538 symcode='[ABCDGISTW]' 539 ;; 540 hpux*) 541 @@ -8912,7 +8912,7 @@ 542 enable_win32_dll=yes 543 544 case $host in 545 -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) 546 +*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) 547 if test -n "$ac_tool_prefix"; then 548 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. 549 set dummy ${ac_tool_prefix}as; ac_word=$2 550 @@ -9813,7 +9813,7 @@ 551 # PIC is the default for these OSes. 552 ;; 553 554 - mingw* | cygwin* | pw32* | os2* | cegcc*) 555 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 556 # This hack is so that the source file can tell whether it is being 557 # built for inclusion in a dll (and should export symbols for example). 558 # Although the cygwin gcc ignores -fPIC, still need this for old-style 559 @@ -9916,7 +9916,7 @@ 560 esac 561 ;; 562 563 - mingw* | cygwin* | pw32* | os2* | cegcc*) 564 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 565 # This hack is so that the source file can tell whether it is being 566 # built for inclusion in a dll (and should export symbols for example). 567 lt_prog_compiler_pic='-DDLL_EXPORT' 568 @@ -10418,7 +10418,7 @@ 569 extract_expsyms_cmds= 570 571 case $host_os in 572 - cygwin* | mingw* | pw32* | cegcc*) 573 + cygwin* | msys* | mingw* | pw32* | cegcc*) 574 # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time 575 # When not using gcc, we currently assume that we are using 576 # Microsoft Visual C++ or Intel C++ Compiler. 577 @@ -10533,7 +10533,7 @@ 578 fi 579 ;; 580 581 - cygwin* | mingw* | pw32* | cegcc*) 582 + cygwin* | msys* | mingw* | pw32* | cegcc*) 583 # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, 584 # as there is no search path for DLLs. 585 hardcode_libdir_flag_spec='-L$libdir' 586 @@ -11074,7 +11074,7 @@ 587 export_dynamic_flag_spec=-rdynamic 588 ;; 589 590 - cygwin* | mingw* | pw32* | cegcc*) 591 + cygwin* | msys* | mingw* | pw32* | cegcc*) 592 # When not using gcc, we currently assume that we are using 593 # Microsoft Visual C++ or Intel C++ Compiler. 594 # hardcode_libdir_flag_spec is actually meaningless, as there is 595 @@ -12110,7 +12110,7 @@ 596 # libtool to hard-code these into programs 597 ;; 598 599 -cygwin* | mingw* | pw32* | cegcc*) 600 +cygwin* | msys* | mingw* | pw32* | cegcc*) 601 version_type=windows 602 shrext_cmds=.dll 603 need_version=no 604 @@ -12136,9 +12136,9 @@ 605 shlibpath_overrides_runpath=yes 606 607 case $host_os in 608 - cygwin*) 609 + cygwin* | msys*) 610 # Cygwin DLLs use 'cyg' prefix rather than 'lib' 611 - soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' 612 + soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' 613 614 sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" 615 ;; 616 @@ -12176,7 +12176,7 @@ 617 # Convert to MSYS style. 618 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 619 ;; 620 - cygwin*) 621 + cygwin* | msys*) 622 # Convert to unix form, then to dos form, then back to unix form 623 # but this time dos style (no spaces!) so that the unix form looks 624 # like /cygdrive/c/PROGRA~1:/cygdr... 625 @@ -12878,7 +12878,7 @@ 626 lt_cv_dlopen_libs= 627 ;; 628 629 - cygwin*) 630 + cygwin* | msys*) 631 lt_cv_dlopen=dlopen 632 lt_cv_dlopen_libs= 633 ;; 634 @@ -13827,7 +13827,7 @@ 635 beos*) 636 LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la" 637 ;; 638 -cygwin* | mingw* | pw32*) 639 +cygwin* | msys* | mingw* | pw32*) 640 ac_fn_c_check_decl "$LINENO" "cygwin_conv_path" "ac_cv_have_decl_cygwin_conv_path" "#include <sys/cygwin.h> 641 " 642 if test "x$ac_cv_have_decl_cygwin_conv_path" = xyes; then : 643 @@ -14242,7 +14242,7 @@ 644 $as_echo_n "(cached) " >&6 645 else 646 case $host_os in #( 647 - *cygwin*) 648 + *cygwin* | *msys*) 649 lt_cv_sys_argz_works=no 650 if test no != "$cross_compiling"; then 651 lt_cv_sys_argz_works="guessing no" 652 @@ -15517,7 +15517,7 @@ 653 esac 654 ;; 655 656 - cygwin* | mingw* | pw32* | cegcc*) 657 + cygwin* | msys* | mingw* | pw32* | cegcc*) 658 case $GXX,$cc_basename in 659 ,cl* | no,cl* | ,icl* | no,icl*) 660 # Native MSVC or ICC 661 @@ -16528,7 +16528,7 @@ 662 beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 663 # PIC is the default for these OSes. 664 ;; 665 - mingw* | cygwin* | os2* | pw32* | cegcc*) 666 + mingw* | cygwin* | msys* | os2* | pw32* | cegcc*) 667 # This hack is so that the source file can tell whether it is being 668 # built for inclusion in a dll (and should export symbols for example). 669 # Although the cygwin gcc ignores -fPIC, still need this for old-style 670 @@ -16603,7 +16603,7 @@ 671 ;; 672 esac 673 ;; 674 - mingw* | cygwin* | os2* | pw32* | cegcc*) 675 + mingw* | cygwin* | msys* | os2* | pw32* | cegcc*) 676 # This hack is so that the source file can tell whether it is being 677 # built for inclusion in a dll (and should export symbols for example). 678 lt_prog_compiler_pic_CXX='-DDLL_EXPORT' 679 @@ -17092,7 +17092,7 @@ 680 pw32*) 681 export_symbols_cmds_CXX=$ltdll_cmds 682 ;; 683 - cygwin* | mingw* | cegcc*) 684 + cygwin* | msys* | mingw* | cegcc*) 685 case $cc_basename in 686 cl* | icl*) 687 exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' 688 @@ -17413,7 +17413,7 @@ 689 # libtool to hard-code these into programs 690 ;; 691 692 -cygwin* | mingw* | pw32* | cegcc*) 693 +cygwin* | msys* | mingw* | pw32* | cegcc*) 694 version_type=windows 695 shrext_cmds=.dll 696 need_version=no 697 @@ -17439,7 +17439,7 @@ 698 shlibpath_overrides_runpath=yes 699 700 case $host_os in 701 - cygwin*) 702 + cygwin* | msys*) 703 # Cygwin DLLs use 'cyg' prefix rather than 'lib' 704 - soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' 705 + soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' 706 707 @@ -17478,7 +17478,7 @@ 708 # Convert to MSYS style. 709 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 710 ;; 711 - cygwin*) 712 + cygwin* | msys*) 713 # Convert to unix form, then to dos form, then back to unix form 714 # but this time dos style (no spaces!) so that the unix form looks 715 # like /cygdrive/c/PROGRA~1:/cygdr... 716 @@ -18519,7 +18519,7 @@ 717 # PIC is the default for these OSes. 718 ;; 719 720 - mingw* | cygwin* | pw32* | os2* | cegcc*) 721 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 722 # This hack is so that the source file can tell whether it is being 723 # built for inclusion in a dll (and should export symbols for example). 724 # Although the cygwin gcc ignores -fPIC, still need this for old-style 725 @@ -18622,7 +18622,7 @@ 726 esac 727 ;; 728 729 - mingw* | cygwin* | pw32* | os2* | cegcc*) 730 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 731 # This hack is so that the source file can tell whether it is being 732 # built for inclusion in a dll (and should export symbols for example). 733 lt_prog_compiler_pic_F77='-DDLL_EXPORT' 734 @@ -19109,7 +19109,7 @@ 735 extract_expsyms_cmds= 736 737 case $host_os in 738 - cygwin* | mingw* | pw32* | cegcc*) 739 + cygwin* | msys* | mingw* | pw32* | cegcc*) 740 # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time 741 # When not using gcc, we currently assume that we are using 742 # Microsoft Visual C++ or Intel C++ Compiler. 743 @@ -19224,7 +19224,7 @@ 744 fi 745 ;; 746 747 - cygwin* | mingw* | pw32* | cegcc*) 748 + cygwin* | msys* | mingw* | pw32* | cegcc*) 749 # _LT_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, 750 # as there is no search path for DLLs. 751 hardcode_libdir_flag_spec_F77='-L$libdir' 752 @@ -19753,7 +19753,7 @@ 753 export_dynamic_flag_spec_F77=-rdynamic 754 ;; 755 756 - cygwin* | mingw* | pw32* | cegcc*) 757 + cygwin* | msys* | mingw* | pw32* | cegcc*) 758 # When not using gcc, we currently assume that we are using 759 # Microsoft Visual C++ or Intel C++ Compiler. 760 # hardcode_libdir_flag_spec is actually meaningless, as there is 761 @@ -20581,7 +20581,7 @@ 762 # libtool to hard-code these into programs 763 ;; 764 765 -cygwin* | mingw* | pw32* | cegcc*) 766 +cygwin* | msys* | mingw* | pw32* | cegcc*) 767 version_type=windows 768 shrext_cmds=.dll 769 need_version=no 770 @@ -20607,9 +20607,9 @@ 771 shlibpath_overrides_runpath=yes 772 773 case $host_os in 774 - cygwin*) 775 + cygwin* | msys*) 776 # Cygwin DLLs use 'cyg' prefix rather than 'lib' 777 - soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' 778 + soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' 779 780 ;; 781 mingw* | cegcc*) 782 @@ -20646,7 +20646,7 @@ 783 # Convert to MSYS style. 784 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 785 ;; 786 - cygwin*) 787 + cygwin* | msys*) 788 # Convert to unix form, then to dos form, then back to unix form 789 # but this time dos style (no spaces!) so that the unix form looks 790 # like /cygdrive/c/PROGRA~1:/cygdr... 791 @@ -21822,7 +21822,7 @@ 792 # PIC is the default for these OSes. 793 ;; 794 795 - mingw* | cygwin* | pw32* | os2* | cegcc*) 796 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 797 # This hack is so that the source file can tell whether it is being 798 # built for inclusion in a dll (and should export symbols for example). 799 # Although the cygwin gcc ignores -fPIC, still need this for old-style 800 @@ -21925,7 +21925,7 @@ 801 esac 802 ;; 803 804 - mingw* | cygwin* | pw32* | os2* | cegcc*) 805 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 806 # This hack is so that the source file can tell whether it is being 807 # built for inclusion in a dll (and should export symbols for example). 808 lt_prog_compiler_pic_FC='-DDLL_EXPORT' 809 @@ -22412,7 +22412,7 @@ 810 extract_expsyms_cmds= 811 812 case $host_os in 813 - cygwin* | mingw* | pw32* | cegcc*) 814 + cygwin* | msys* | mingw* | pw32* | cegcc*) 815 # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time 816 # When not using gcc, we currently assume that we are using 817 # Microsoft Visual C++ or Intel C++ Compiler. 818 @@ -22527,7 +22527,7 @@ 819 fi 820 ;; 821 822 - cygwin* | mingw* | pw32* | cegcc*) 823 + cygwin* | msys* | mingw* | pw32* | cegcc*) 824 # _LT_TAGVAR(hardcode_libdir_flag_spec, FC) is actually meaningless, 825 # as there is no search path for DLLs. 826 hardcode_libdir_flag_spec_FC='-L$libdir' 827 @@ -23056,7 +23056,7 @@ 828 export_dynamic_flag_spec_FC=-rdynamic 829 ;; 830 831 - cygwin* | mingw* | pw32* | cegcc*) 832 + cygwin* | msys* | mingw* | pw32* | cegcc*) 833 # When not using gcc, we currently assume that we are using 834 # Microsoft Visual C++ or Intel C++ Compiler. 835 # hardcode_libdir_flag_spec is actually meaningless, as there is 836 @@ -23884,7 +23884,7 @@ 837 # libtool to hard-code these into programs 838 ;; 839 840 -cygwin* | mingw* | pw32* | cegcc*) 841 +cygwin* | msys* | mingw* | pw32* | cegcc*) 842 version_type=windows 843 shrext_cmds=.dll 844 need_version=no 845 @@ -23910,9 +23910,9 @@ 846 shlibpath_overrides_runpath=yes 847 848 case $host_os in 849 - cygwin*) 850 + cygwin* | msys*) 851 # Cygwin DLLs use 'cyg' prefix rather than 'lib' 852 - soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' 853 + soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' 854 855 ;; 856 mingw* | cegcc*) 857 @@ -23949,7 +23949,7 @@ 858 # Convert to MSYS style. 859 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 860 ;; 861 - cygwin*) 862 + cygwin* | msys*) 863 # Convert to unix form, then to dos form, then back to unix form 864 # but this time dos style (no spaces!) so that the unix form looks 865 # like /cygdrive/c/PROGRA~1:/cygdr... 866 @@ -24844,7 +24844,7 @@ 867 # PIC is the default for these OSes. 868 ;; 869 870 - mingw* | cygwin* | pw32* | os2* | cegcc*) 871 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 872 # This hack is so that the source file can tell whether it is being 873 # built for inclusion in a dll (and should export symbols for example). 874 # Although the cygwin gcc ignores -fPIC, still need this for old-style 875 @@ -24947,7 +24947,7 @@ 876 esac 877 ;; 878 879 - mingw* | cygwin* | pw32* | os2* | cegcc*) 880 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 881 # This hack is so that the source file can tell whether it is being 882 # built for inclusion in a dll (and should export symbols for example). 883 lt_prog_compiler_pic_GO='-DDLL_EXPORT' 884 @@ -25434,7 +25434,7 @@ 885 extract_expsyms_cmds= 886 887 case $host_os in 888 - cygwin* | mingw* | pw32* | cegcc*) 889 + cygwin* | msys* | mingw* | pw32* | cegcc*) 890 # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time 891 # When not using gcc, we currently assume that we are using 892 # Microsoft Visual C++ or Intel C++ Compiler. 893 @@ -25549,7 +25549,7 @@ 894 fi 895 ;; 896 897 - cygwin* | mingw* | pw32* | cegcc*) 898 + cygwin* | msys* | mingw* | pw32* | cegcc*) 899 # _LT_TAGVAR(hardcode_libdir_flag_spec, GO) is actually meaningless, 900 # as there is no search path for DLLs. 901 hardcode_libdir_flag_spec_GO='-L$libdir' 902 @@ -26090,7 +26090,7 @@ 903 export_dynamic_flag_spec_GO=-rdynamic 904 ;; 905 906 - cygwin* | mingw* | pw32* | cegcc*) 907 + cygwin* | msys* | mingw* | pw32* | cegcc*) 908 # When not using gcc, we currently assume that we are using 909 # Microsoft Visual C++ or Intel C++ Compiler. 910 # hardcode_libdir_flag_spec is actually meaningless, as there is 911 @@ -27073,7 +27073,7 @@ 912 # PIC is the default for these OSes. 913 ;; 914 915 - mingw* | cygwin* | pw32* | os2* | cegcc*) 916 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 917 # This hack is so that the source file can tell whether it is being 918 # built for inclusion in a dll (and should export symbols for example). 919 # Although the cygwin gcc ignores -fPIC, still need this for old-style 920 @@ -27176,7 +27176,7 @@ 921 esac 922 ;; 923 924 - mingw* | cygwin* | pw32* | os2* | cegcc*) 925 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 926 # This hack is so that the source file can tell whether it is being 927 # built for inclusion in a dll (and should export symbols for example). 928 929 @@ -27663,7 +27663,7 @@ 930 extract_expsyms_cmds= 931 932 case $host_os in 933 - cygwin* | mingw* | pw32* | cegcc*) 934 + cygwin* | msys* | mingw* | pw32* | cegcc*) 935 # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time 936 # When not using gcc, we currently assume that we are using 937 # Microsoft Visual C++ or Intel C++ Compiler. 938 @@ -27778,7 +27778,7 @@ 939 fi 940 ;; 941 942 - cygwin* | mingw* | pw32* | cegcc*) 943 + cygwin* | msys* | mingw* | pw32* | cegcc*) 944 # _LT_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, 945 # as there is no search path for DLLs. 946 hardcode_libdir_flag_spec_GCJ='-L$libdir' 947 @@ -28319,7 +28319,7 @@ 948 export_dynamic_flag_spec_GCJ=-rdynamic 949 ;; 950 951 - cygwin* | mingw* | pw32* | cegcc*) 952 + cygwin* | msys* | mingw* | pw32* | cegcc*) 953 # When not using gcc, we currently assume that we are using 954 # Microsoft Visual C++ or Intel C++ Compiler. 955 # hardcode_libdir_flag_spec is actually meaningless, as there is 956 957 diff -urN libtool-2.4.7/libltdl/configure.orig libtool-2.4.7/libltdl/configure 958 --- libtool-2.4.7/libltdl/configure.orig 2022-05-25 14:29:13.245182300 +0200 959 +++ libtool-2.4.7/libltdl/configure 2022-05-25 14:30:03.920944200 +0200 960 @@ -4774,7 +4774,7 @@ 961 lt_cv_sys_max_cmd_len=-1; 962 ;; 963 964 - cygwin* | mingw* | cegcc*) 965 + cygwin* | msys* | mingw* | cegcc*) 966 # On Win9x/ME, this test blows up -- it succeeds, but takes 967 # about 5 minutes as the teststring grows exponentially. 968 # Worse, since 9x/ME are not pre-emptively multitasking, 969 @@ -4940,7 +4940,7 @@ 970 *-*-mingw* ) # actually msys 971 lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 972 ;; 973 - *-*-cygwin* ) 974 + *-*-cygwin* | *-*-msys* ) 975 lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 976 ;; 977 * ) # otherwise, assume *nix 978 @@ -4948,12 +4948,12 @@ 979 ;; 980 esac 981 ;; 982 - *-*-cygwin* ) 983 + *-*-cygwin* | *-*-msys* ) 984 case $build in 985 *-*-mingw* ) # actually msys 986 lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 987 ;; 988 - *-*-cygwin* ) 989 + *-*-cygwin* | *-*-msys* ) 990 lt_cv_to_host_file_cmd=func_convert_file_noop 991 ;; 992 * ) # otherwise, assume *nix 993 @@ -5019,7 +5019,7 @@ 994 esac 995 reload_cmds='$LD$reload_flag -o $output$reload_objs' 996 case $host_os in 997 - cygwin* | mingw* | pw32* | cegcc*) 998 + cygwin* | msys* | mingw* | pw32* | cegcc*) 999 if test yes != "$GCC"; then 1000 reload_cmds=false 1001 fi 1002 @@ -5272,7 +5272,7 @@ 1003 lt_cv_file_magic_test_file=/shlib/libc.so 1004 ;; 1005 1006 -cygwin*) 1007 +cygwin* | msys*) 1008 # func_win32_libid is a shell function defined in ltmain.sh 1009 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 1010 lt_cv_file_magic_cmd='func_win32_libid' 1011 @@ -5588,7 +5588,7 @@ 1012 lt_cv_sharedlib_from_linklib_cmd='unknown' 1013 1014 case $host_os in 1015 -cygwin* | mingw* | pw32* | cegcc*) 1016 +cygwin* | msys* | mingw* | pw32* | cegcc*) 1017 # two different shell functions defined in ltmain.sh; 1018 # decide which one to use based on capabilities of $DLLTOOL 1019 case `$DLLTOOL --help 2>&1` in 1020 @@ -6097,7 +6097,7 @@ 1021 aix*) 1022 symcode='[BCDT]' 1023 ;; 1024 -cygwin* | mingw* | pw32* | cegcc*) 1025 +cygwin* | msys* | mingw* | pw32* | cegcc*) 1026 symcode='[ABCDGISTW]' 1027 ;; 1028 hpux*) 1029 @@ -7837,7 +7837,7 @@ 1030 enable_win32_dll=yes 1031 1032 case $host in 1033 -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) 1034 +*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) 1035 if test -n "$ac_tool_prefix"; then 1036 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. 1037 set dummy ${ac_tool_prefix}as; ac_word=$2 1038 @@ -8738,7 +8738,7 @@ 1039 # PIC is the default for these OSes. 1040 ;; 1041 1042 - mingw* | cygwin* | pw32* | os2* | cegcc*) 1043 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 1044 # This hack is so that the source file can tell whether it is being 1045 # built for inclusion in a dll (and should export symbols for example). 1046 # Although the cygwin gcc ignores -fPIC, still need this for old-style 1047 @@ -8841,7 +8841,7 @@ 1048 esac 1049 ;; 1050 1051 - mingw* | cygwin* | pw32* | os2* | cegcc*) 1052 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 1053 # This hack is so that the source file can tell whether it is being 1054 # built for inclusion in a dll (and should export symbols for example). 1055 lt_prog_compiler_pic='-DDLL_EXPORT' 1056 @@ -9343,7 +9343,7 @@ 1057 extract_expsyms_cmds= 1058 1059 case $host_os in 1060 - cygwin* | mingw* | pw32* | cegcc*) 1061 + cygwin* | msys* | mingw* | pw32* | cegcc*) 1062 # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time 1063 # When not using gcc, we currently assume that we are using 1064 # Microsoft Visual C++ or Intel C++ Compiler. 1065 @@ -9458,7 +9458,7 @@ 1066 fi 1067 ;; 1068 1069 - cygwin* | mingw* | pw32* | cegcc*) 1070 + cygwin* | msys* | mingw* | pw32* | cegcc*) 1071 # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, 1072 # as there is no search path for DLLs. 1073 hardcode_libdir_flag_spec='-L$libdir' 1074 @@ -9999,7 +9999,7 @@ 1075 export_dynamic_flag_spec=-rdynamic 1076 ;; 1077 1078 - cygwin* | mingw* | pw32* | cegcc*) 1079 + cygwin* | msys* | mingw* | pw32* | cegcc*) 1080 # When not using gcc, we currently assume that we are using 1081 # Microsoft Visual C++ or Intel C++ Compiler. 1082 # hardcode_libdir_flag_spec is actually meaningless, as there is 1083 @@ -11035,7 +11035,7 @@ 1084 # libtool to hard-code these into programs 1085 ;; 1086 1087 -cygwin* | mingw* | pw32* | cegcc*) 1088 +cygwin* | msys* | mingw* | pw32* | cegcc*) 1089 version_type=windows 1090 shrext_cmds=.dll 1091 need_version=no 1092 @@ -11067,6 +11067,12 @@ 1093 1094 sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" 1095 ;; 1096 + msys*) 1097 + # MSYS DLLs use 'msys-' prefix rather than 'lib' 1098 + soname_spec='`echo $libname | sed -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' 1099 + 1100 + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" 1101 + ;; 1102 mingw* | cegcc*) 1103 # MinGW DLLs use traditional 'lib' prefix 1104 soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' 1105 @@ -11101,7 +11107,7 @@ 1106 # Convert to MSYS style. 1107 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` 1108 ;; 1109 - cygwin*) 1110 + cygwin* | msys*) 1111 # Convert to unix form, then to dos form, then back to unix form 1112 # but this time dos style (no spaces!) so that the unix form looks 1113 # like /cygdrive/c/PROGRA~1:/cygdr... 1114 @@ -11803,7 +11809,7 @@ 1115 lt_cv_dlopen_libs= 1116 ;; 1117 1118 - cygwin*) 1119 + cygwin* | msys*) 1120 lt_cv_dlopen=dlopen 1121 lt_cv_dlopen_libs= 1122 ;; 1123 @@ -12751,7 +12757,7 @@ 1124 beos*) 1125 LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la" 1126 ;; 1127 -cygwin* | mingw* | pw32*) 1128 +cygwin* | msys* | mingw* | pw32*) 1129 ac_fn_c_check_decl "$LINENO" "cygwin_conv_path" "ac_cv_have_decl_cygwin_conv_path" "#include <sys/cygwin.h> 1130 " 1131 if test "x$ac_cv_have_decl_cygwin_conv_path" = xyes; then : 1132 @@ -13166,7 +13172,7 @@ 1133 $as_echo_n "(cached) " >&6 1134 else 1135 case $host_os in #( 1136 - *cygwin*) 1137 + *cygwin* | *msys*) 1138 lt_cv_sys_argz_works=no 1139 if test no != "$cross_compiling"; then 1140 lt_cv_sys_argz_works="guessing no" 1141 1142 diff -urN libtool-2.4.7/m4/libtool.m4.orig libtool-2.4.7/m4/libtool.m4 1143 --- libtool-2.4.7/m4/libtool.m4.orig 2022-03-17 03:43:39.000000000 +0100 1144 +++ libtool-2.4.7/m4/libtool.m4 2022-05-25 14:26:59.035745300 +0200 1145 @@ -1703,7 +1703,7 @@ 1146 lt_cv_sys_max_cmd_len=-1; 1147 ;; 1148 1149 - cygwin* | mingw* | cegcc*) 1150 + cygwin* | msys* | mingw* | cegcc*) 1151 # On Win9x/ME, this test blows up -- it succeeds, but takes 1152 # about 5 minutes as the teststring grows exponentially. 1153 # Worse, since 9x/ME are not pre-emptively multitasking, 1154 @@ -1951,7 +1951,7 @@ 1155 lt_cv_dlopen_libs= 1156 ;; 1157 1158 - cygwin*) 1159 + cygwin* | msys*) 1160 lt_cv_dlopen=dlopen 1161 lt_cv_dlopen_libs= 1162 ;; 1163 @@ -2541,7 +2541,7 @@ 1164 # libtool to hard-code these into programs 1165 ;; 1166 1167 -cygwin* | mingw* | pw32* | cegcc*) 1168 +cygwin* | msys* | mingw* | pw32* | cegcc*) 1169 version_type=windows 1170 shrext_cmds=.dll 1171 need_version=no 1172 @@ -2567,9 +2567,9 @@ 1173 shlibpath_overrides_runpath=yes 1174 1175 case $host_os in 1176 - cygwin*) 1177 + cygwin* | msys*) 1178 # Cygwin DLLs use 'cyg' prefix rather than 'lib' 1179 - soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' 1180 + soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' 1181 m4_if([$1], [],[ 1182 sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) 1183 ;; 1184 @@ -2607,7 +2607,7 @@ 1185 # Convert to MSYS style. 1186 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` 1187 ;; 1188 - cygwin*) 1189 + cygwin* | msys*) 1190 # Convert to unix form, then to dos form, then back to unix form 1191 # but this time dos style (no spaces!) so that the unix form looks 1192 # like /cygdrive/c/PROGRA~1:/cygdr... 1193 @@ -3385,7 +3385,7 @@ 1194 esac 1195 reload_cmds='$LD$reload_flag -o $output$reload_objs' 1196 case $host_os in 1197 - cygwin* | mingw* | pw32* | cegcc*) 1198 + cygwin* | msys* | mingw* | pw32* | cegcc*) 1199 if test yes != "$GCC"; then 1200 reload_cmds=false 1201 fi 1202 @@ -3478,7 +3478,7 @@ 1203 lt_cv_file_magic_test_file=/shlib/libc.so 1204 ;; 1205 1206 -cygwin*) 1207 +cygwin* | msys*) 1208 # func_win32_libid is a shell function defined in ltmain.sh 1209 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' 1210 lt_cv_file_magic_cmd='func_win32_libid' 1211 @@ -3791,7 +3791,7 @@ 1212 [lt_cv_sharedlib_from_linklib_cmd='unknown' 1213 1214 case $host_os in 1215 -cygwin* | mingw* | pw32* | cegcc*) 1216 +cygwin* | msys* | mingw* | pw32* | cegcc*) 1217 # two different shell functions defined in ltmain.sh; 1218 # decide which one to use based on capabilities of $DLLTOOL 1219 case `$DLLTOOL --help 2>&1` in 1220 @@ -3861,7 +3861,7 @@ 1221 [AC_REQUIRE([AC_CANONICAL_HOST])dnl 1222 LIBM= 1223 case $host in 1224 -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) 1225 +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*) 1226 # These system don't have libm, or don't need it 1227 ;; 1228 *-ncr-sysv4.3*) 1229 @@ -3936,7 +3936,7 @@ 1230 aix*) 1231 symcode='[[BCDT]]' 1232 ;; 1233 -cygwin* | mingw* | pw32* | cegcc*) 1234 +cygwin* | msys* | mingw* | pw32* | cegcc*) 1235 symcode='[[ABCDGISTW]]' 1236 ;; 1237 hpux*) 1238 @@ -4242,7 +4242,7 @@ 1239 beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 1240 # PIC is the default for these OSes. 1241 ;; 1242 - mingw* | cygwin* | os2* | pw32* | cegcc*) 1243 + mingw* | cygwin* | msys* | os2* | pw32* | cegcc*) 1244 # This hack is so that the source file can tell whether it is being 1245 # built for inclusion in a dll (and should export symbols for example). 1246 # Although the cygwin gcc ignores -fPIC, still need this for old-style 1247 @@ -4318,7 +4318,7 @@ 1248 ;; 1249 esac 1250 ;; 1251 - mingw* | cygwin* | os2* | pw32* | cegcc*) 1252 + mingw* | cygwin* | msys* | os2* | pw32* | cegcc*) 1253 # This hack is so that the source file can tell whether it is being 1254 # built for inclusion in a dll (and should export symbols for example). 1255 m4_if([$1], [GCJ], [], 1256 @@ -4566,7 +4566,7 @@ 1257 # PIC is the default for these OSes. 1258 ;; 1259 1260 - mingw* | cygwin* | pw32* | os2* | cegcc*) 1261 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 1262 # This hack is so that the source file can tell whether it is being 1263 # built for inclusion in a dll (and should export symbols for example). 1264 # Although the cygwin gcc ignores -fPIC, still need this for old-style 1265 @@ -4670,7 +4670,7 @@ 1266 esac 1267 ;; 1268 1269 - mingw* | cygwin* | pw32* | os2* | cegcc*) 1270 + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) 1271 # This hack is so that the source file can tell whether it is being 1272 # built for inclusion in a dll (and should export symbols for example). 1273 m4_if([$1], [GCJ], [], 1274 @@ -4945,7 +4945,7 @@ 1275 pw32*) 1276 _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds 1277 ;; 1278 - cygwin* | mingw* | cegcc*) 1279 + cygwin* | msys* | mingw* | cegcc*) 1280 case $cc_basename in 1281 cl* | icl*) 1282 _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' 1283 @@ -5003,7 +5003,7 @@ 1284 extract_expsyms_cmds= 1285 1286 case $host_os in 1287 - cygwin* | mingw* | pw32* | cegcc*) 1288 + cygwin* | msys* | mingw* | pw32* | cegcc*) 1289 # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time 1290 # When not using gcc, we currently assume that we are using 1291 # Microsoft Visual C++ or Intel C++ Compiler. 1292 @@ -5118,7 +5118,7 @@ 1293 fi 1294 ;; 1295 1296 - cygwin* | mingw* | pw32* | cegcc*) 1297 + cygwin* | msys* | mingw* | pw32* | cegcc*) 1298 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, 1299 # as there is no search path for DLLs. 1300 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 1301 @@ -5575,7 +5575,7 @@ 1302 _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic 1303 ;; 1304 1305 - cygwin* | mingw* | pw32* | cegcc*) 1306 + cygwin* | msys* | mingw* | pw32* | cegcc*) 1307 # When not using gcc, we currently assume that we are using 1308 # Microsoft Visual C++ or Intel C++ Compiler. 1309 # hardcode_libdir_flag_spec is actually meaningless, as there is 1310 @@ -6651,7 +6651,7 @@ 1311 esac 1312 ;; 1313 1314 - cygwin* | mingw* | pw32* | cegcc*) 1315 + cygwin* | msys* | mingw* | pw32* | cegcc*) 1316 case $GXX,$cc_basename in 1317 ,cl* | no,cl* | ,icl* | no,icl*) 1318 # Native MSVC or ICC 1319 @@ -8348,7 +8348,7 @@ 1320 *-*-mingw* ) # actually msys 1321 lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 1322 ;; 1323 - *-*-cygwin* ) 1324 + *-*-cygwin* | *-*-msys* ) 1325 lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 1326 ;; 1327 * ) # otherwise, assume *nix 1328 @@ -8356,12 +8356,12 @@ 1329 ;; 1330 esac 1331 ;; 1332 - *-*-cygwin* ) 1333 + *-*-cygwin* | *-*-msys* ) 1334 case $build in 1335 *-*-mingw* ) # actually msys 1336 lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin 1337 ;; 1338 - *-*-cygwin* ) 1339 + *-*-cygwin* | *-*-msys* ) 1340 lt_cv_to_host_file_cmd=func_convert_file_noop 1341 ;; 1342 * ) # otherwise, assume *nix 1343 1344 diff -Naur libtool-2.4.2.418-orig/m4/ltdl.m4 libtool-2.4.2.418/m4/ltdl.m4 1345 --- libtool-2.4.2.418-orig/m4/ltdl.m4 2013-10-26 03:37:46.000000000 +0400 1346 +++ libtool-2.4.2.418/m4/ltdl.m4 2014-09-02 10:19:58.102800000 +0400 1347 @@ -706,7 +706,7 @@ 1348 beos*) 1349 LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la" 1350 ;; 1351 -cygwin* | mingw* | pw32*) 1352 +cygwin* | msys* | mingw* | pw32*) 1353 AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]]) 1354 LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la" 1355 ;; 1356 1357 diff -Naur libtool-2.4.2.418-orig/m4/ltoptions.m4 libtool-2.4.2.418/m4/ltoptions.m4 1358 --- libtool-2.4.2.418-orig/m4/ltoptions.m4 2013-10-26 03:37:46.000000000 +0400 1359 +++ libtool-2.4.2.418/m4/ltoptions.m4 2014-09-02 10:20:19.069200000 +0400 1360 @@ -126,7 +126,7 @@ 1361 [enable_win32_dll=yes 1362 1363 case $host in 1364 -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) 1365 +*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) 1366 AC_CHECK_TOOL(AS, as, false) 1367 AC_CHECK_TOOL(DLLTOOL, dlltool, false) 1368 AC_CHECK_TOOL(OBJDUMP, objdump, false) 1369 1370 diff -Naur libtool-2.4.2.418-orig/tests/bindir.at libtool-2.4.2.418/tests/bindir.at 1371 --- libtool-2.4.2.418-orig/tests/bindir.at 2013-01-26 08:19:10.000000000 +0400 1372 +++ libtool-2.4.2.418/tests/bindir.at 2014-09-02 10:21:21.999600000 +0400 1373 @@ -65,7 +65,7 @@ 1374 1375 bindirneeded=: 1376 case $host_os in 1377 - cygwin*|mingw*|cegcc*) 1378 + cygwin*|msys*|mingw*|cegcc*) 1379 ;; 1380 *) 1381 bindirneeded=false 1382 @@ -174,7 +174,7 @@ 1383 1384 bindirneeded=: 1385 case $host_os in 1386 - cygwin*|mingw*|cegcc*) 1387 + cygwin*|msys*|mingw*|cegcc*) 1388 ;; 1389 *) 1390 bindirneeded=false 1391 1392 diff -Naur libtool-2.4.2.418-orig/tests/lt_dladvise.at libtool-2.4.2.418/tests/lt_dladvise.at 1393 --- libtool-2.4.2.418-orig/tests/lt_dladvise.at 2013-01-01 21:36:01.000000000 +0400 1394 +++ libtool-2.4.2.418/tests/lt_dladvise.at 2014-09-02 10:20:51.298800000 +0400 1395 @@ -332,7 +332,7 @@ 1396 $LIBTOOL --features | grep 'enable shared libraries' >/dev/null && have_shared=: 1397 1398 case $host_os,$have_shared in 1399 -cygwin* | mingw* | cegcc* | *,false) 1400 +cygwin* | msys* | mingw* | cegcc* | *,false) 1401 # These hosts do not support linking without -no-undefined 1402 CPPFLAGS="$CPPFLAGS -DHAVE_UNDEFINED_SYMBOLS=0" 1403 ;;