From 3577b8a85e505c11d5a6c79959c57e035939680c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 16 May 2025 22:55:46 +0200 Subject: [PATCH] package/pkg-autotools.mk: LIBTOOL_PATCH_HOOK: also handle libtool 2.5.x Fixes: https://autobuild.buildroot.org/results/ac60d29fbcd9fb8ddb21b76b3b185e45e580c006/ Libtool 2.5.x has been released and is starting to be used by upstreams when generating release tarballs (E.G. openvpn-2.6.14). https://lists.gnu.org/archive/html/autotools-announce/2024-09/msg00000.html It needs to be patched similar to earlier versions, and the existing v2.4.4 patch luckily still applies, so extend LIBTOOL_PATCH_HOOK to also patch 2.5.x versions with that. Signed-off-by: Peter Korsgaard Tested-by: Bernd Kuhls [fixes build of openvpn-2.6.14] (cherry picked from commit 4cca0f30f2b263acf97c6d0abd8d31e2417542e2) Signed-off-by: Thomas Perale --- package/pkg-autotools.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 8ffb0e0047..16b21acb6d 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -74,6 +74,8 @@ define LIBTOOL_PATCH_HOOK else \ patch -i support/libtool/buildroot-libtool-v2.4.patch $${i}; \ fi \ + elif test $${ltmain_version} = "2.5"; then\ + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $${i}; \ fi \ done endef