Merge pull request #2439 from mati865/libtool-llvm-fix

libtool: fix recent patch

libtool/0014-Support-llvm-objdump-f-output.patch

@@ -1,18 +1,18 @@
-From 1a4e74ef284f0944f474df5c28afd6c1737f66b6 Mon Sep 17 00:00:00 2001
+From 03dabb6a70847761e65572a2a7b770a3b1b9f123 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <mati865@gmail.com>
-Date: Sat, 10 Apr 2021 00:39:05 +0200
+Date: Mon, 12 Apr 2021 23:44:10 +0200
 Subject: [PATCH] Support llvm-objdump -f output
 
 ---
- build-aux/ltmain.sh | 2 +-
+ build-aux/ltmain.in | 2 +-
  m4/libtool.m4       | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
-index ff0690f..b35fe5e 100644
---- a/build-aux/ltmain.sh
-+++ b/build-aux/ltmain.sh
-@@ -4931,7 +4931,7 @@ func_win32_libid ()
+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 |
@@ -22,7 +22,7 @@ index ff0690f..b35fe5e 100644
        "MS dumpbin")
  	if func_cygming_ms_implib_p "$1" ||
 diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index 21a7d60..913ca5e 100644
+index 21a7d60..594be9c 100644
 --- a/m4/libtool.m4
 +++ b/m4/libtool.m4
 @@ -3473,7 +3473,7 @@ mingw* | pw32*)

libtool/PKGBUILD

@@ -3,7 +3,7 @@
 pkgname=('libtool' 'libltdl')
 pkgver=2.4.6
 _gccver=10.2.0
-pkgrel=10
+pkgrel=11
 pkgdesc="A generic library support script"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/libtool/"
@@ -35,7 +35,7 @@ sha256sums=('7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f'
             'c727b2b017163cfdeca60820d3cff2dac8968c5630745602b150f92b159af313'
             'c95a65e890b1ae6362807abc66809e72cf81aeea5f9f556e38f9752f974bf435'
             '8069e887aeeab7491f15e00547fa66d9b9e86407f5a23f37a6d8c7d165de752e'
-            'd0f155c1ec4af524de296ebea4c55103f494fa33a6ac0280ed05183851903eff')
+            'db16cd322e0ebc578c906e94b0788810af17ce617c700a50db2e3c598dbbed7e')
 
  validpgpkeys=('CFE2BE707B538E8B26757D84151308092983D606') #Gary Vaughan (Free Software Developer) <gary@vaughan.pe>