From eeaef3228cdb33df9ced60a2be193c63219f2b1b Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 17 Mar 2022 10:09:44 +0000
Subject: [PATCH] libtool: update to 2.4.7

---
 packages/devel/libtool/package.mk             |  9 ++++++---
 .../patches/libtool-02-aclocal-m4.patch       | 20 +++++++++++++++++++
 .../libtool/patches/libtool-02-use_ld.patch   | 13 ------------
 3 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 packages/devel/libtool/patches/libtool-02-aclocal-m4.patch
 delete mode 100644 packages/devel/libtool/patches/libtool-02-use_ld.patch

diff --git a/packages/devel/libtool/package.mk b/packages/devel/libtool/package.mk
index 29a69cc689..9ea61cbffc 100644
--- a/packages/devel/libtool/package.mk
+++ b/packages/devel/libtool/package.mk
@@ -3,18 +3,21 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libtool"
-PKG_VERSION="2.4.6"
-PKG_SHA256="e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3"
+PKG_VERSION="2.4.7"
+PKG_SHA256="04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/libtool/"
 PKG_URL="http://ftpmirror.gnu.org/libtool/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host intltool:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A generic library support script."
-PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared"
 
+post_unpack() {
+  chmod u+w ${PKG_BUILD}/build-aux/ltmain.sh
+}
+
 post_makeinstall_target() {
   rm -rf ${INSTALL}/usr/bin
   rm -rf ${INSTALL}/usr/share
diff --git a/packages/devel/libtool/patches/libtool-02-aclocal-m4.patch b/packages/devel/libtool/patches/libtool-02-aclocal-m4.patch
new file mode 100644
index 0000000000..4117f06fde
--- /dev/null
+++ b/packages/devel/libtool/patches/libtool-02-aclocal-m4.patch
@@ -0,0 +1,20 @@
+--- a/aclocal.m4	2022-03-17 02:45:15.000000000 +0000
++++ b/aclocal.m4	2022-03-18 08:15:31.544666740 +0000
+@@ -35,7 +35,7 @@
+ [am__api_version='1.16'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.16.3], [],
++m4_if([$1], [1.16.5], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+ 
+@@ -51,7 +51,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.16.3])dnl
++[AM_AUTOMAKE_VERSION([1.16.5])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/packages/devel/libtool/patches/libtool-02-use_ld.patch b/packages/devel/libtool/patches/libtool-02-use_ld.patch
deleted file mode 100644
index e98c856e8e..0000000000
--- a/packages/devel/libtool/patches/libtool-02-use_ld.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
-index 23901ff..df26ab5 100644
---- a/build-aux/ltmain.sh
-+++ b/build-aux/ltmain.sh
-@@ -7250,7 +7250,7 @@ func_mode_link ()
-       # -stdlib=*            select c++ std lib with clang
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-fuse-ld=*)
-         func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
-         func_append compile_command " $arg"