31cf2ca0aa
It was removed in #10338 because it wasn't really used and the msys one seemed good enough for autotools (via libtoolize), and all packages using it were really just depending on libltdl. Turns out some mingw packages use libtool directly and the msys one has various things hardcoded for that environment, resulting for example in wrongly named .dlls. This adds back the mingw libtool with all patches synched from the msys one and the Windows paths fixed up in the libtool script. Also add it as a dependency to autotools, so we avoid sometimes the msys one being used and sometimes the mingw one, which would make it harded to debug. Ideally this doesn't change anything for existing packages and just fixes the ones using libtool directly, for example mingw-w64-libvterm and mingw-w64-libtommath. There is also a libtool integration test being added now in https://github.com/msys2/msys2-tests/pull/45
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From 03dabb6a70847761e65572a2a7b770a3b1b9f123 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <mati865@gmail.com>
|
|
Date: Mon, 12 Apr 2021 23:44:10 +0200
|
|
Subject: [PATCH] Support llvm-objdump -f output
|
|
|
|
---
|
|
build-aux/ltmain.in | 2 +-
|
|
m4/libtool.m4 | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
|
index a9f070a..4a434cc 100644
|
|
--- a/build-aux/ltmain.in
|
|
+++ b/build-aux/ltmain.in
|
|
@@ -3019,7 +3019,7 @@ func_win32_libid ()
|
|
*ar\ archive*) # could be an import, or static
|
|
# Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
|
|
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
|
|
- $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
|
|
+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|coff-arm|coff-arm64|coff-i386|coff-x86-64)' >/dev/null; then
|
|
case $nm_interface in
|
|
"MS dumpbin")
|
|
if func_cygming_ms_implib_p "$1" ||
|
|
diff --git a/m4/libtool.m4 b/m4/libtool.m4
|
|
index 21a7d60..594be9c 100644
|
|
--- a/m4/libtool.m4
|
|
+++ b/m4/libtool.m4
|
|
@@ -3473,7 +3473,7 @@ mingw* | pw32*)
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
else
|
|
# Keep this pattern in sync with the one in func_win32_libid.
|
|
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
|
|
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|coff-arm|coff-arm64|coff-i386|coff-x86-64)'
|
|
lt_cv_file_magic_cmd='$OBJDUMP -f'
|
|
fi
|
|
;;
|
|
--
|
|
2.31.1
|
|
|