From e0f5ce9746323f0c38e49594411dbeb5394e2f15 Mon Sep 17 00:00:00 2001 From: Jack Sun Date: Sun, 2 Feb 2025 10:38:26 +0800 Subject: [PATCH] tools/autoconf: bump to 2.72 refresh patch:000-relocatable.patch Announcement:https://lists.gnu.org/archive/html/autotools-announce/2023-12/msg00003.html Signed-off-by: Jack Sun Link: https://github.com/openwrt/openwrt/pull/17825 Signed-off-by: Christian Marangi --- tools/autoconf/Makefile | 6 +++--- tools/autoconf/patches/000-relocatable.patch | 22 ++------------------ 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/tools/autoconf/Makefile b/tools/autoconf/Makefile index d933c712b4..1058cf9ac4 100644 --- a/tools/autoconf/Makefile +++ b/tools/autoconf/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autoconf -PKG_VERSION:=2.71 +PKG_VERSION:=2.72 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/autoconf -PKG_HASH:=431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c +PKG_HASH:=ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/autoconf/patches/000-relocatable.patch b/tools/autoconf/patches/000-relocatable.patch index 3961d2264b..bc8a2d1b7c 100644 --- a/tools/autoconf/patches/000-relocatable.patch +++ b/tools/autoconf/patches/000-relocatable.patch @@ -58,7 +58,7 @@ # Some non-GNU m4's don't reject the --help option, so give them /dev/null. fatal "need GNU m4 1.4 or later: $m4" if system "$m4 --help &1 | grep reload-state >/dev/null"; -@@ -272,6 +276,12 @@ sub load_configuration ($) +@@ -322,6 +326,12 @@ sub load_configuration ($) my @words = shellwords ($_); my $type = shift @words; @@ -88,7 +88,7 @@ unshift @INC, $pkgdatadir; $buildauxdir = $ENV{'autom4te_buildauxdir'} || $pkgdatadir . '/build-aux'; -@@ -117,9 +120,9 @@ Written by David J. MacKenzie and Akim D +@@ -116,9 +119,9 @@ Written by David J. MacKenzie and Akim D "; # Lib files. @@ -175,21 +175,3 @@ unshift @INC, $pkgdatadir; # Override SHELL. On DJGPP SHELL may not be set to a shell ---- a/bin/autoconf.as -+++ b/bin/autoconf.as -@@ -89,8 +89,13 @@ exit_missing_arg=' - # restore font-lock: ' - - # Variables. --: ${AUTOM4TE='@bindir@/@autom4te-name@'} --: ${trailer_m4='@pkgdatadir@/autoconf/trailer.m4'} -+if test -n "$STAGING_DIR_HOST"; then -+ : ${AUTOM4TE="$STAGING_DIR_HOST/bin/@autom4te-name@"} -+ : ${trailer_m4="$STAGING_DIR_HOST/share/autoconf/autoconf/trailer.m4"} -+else -+ : ${AUTOM4TE='@bindir@/@autom4te-name@'} -+ : ${trailer_m4='@pkgdatadir@/autoconf/trailer.m4'} -+fi - autom4te_options= - outfile= - verbose=false -- 2.30.2