From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 4 Mar 2023 14:46:32 +0000 (+0000)
Subject: macros: Don't run MACRO_FIX_AUTOTOOLS all the time any more
X-Git-Tag: 0.9.29~367
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0459fe3a7542f9bd36c2786a237c14a9c7ca5ec;p=pakfire.git

macros: Don't run MACRO_FIX_AUTOTOOLS all the time any more

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/macros/build.macro b/macros/build.macro
index 20e70c064..5b0877fb2 100644
--- a/macros/build.macro
+++ b/macros/build.macro
@@ -58,15 +58,11 @@ def MACRO_PYTHON_COMPILE
 end
 
 def MACRO_FIX_AUTOTOOLS
-	if [ "%{DISTRO_ARCH}" = "aarch64" ]; then
-		for i in $(find %{DIR_SRC} -name config.guess -or -name config.sub); do
-			if ! grep -q "aarch64" ${i}; then
-				if [ -e "/usr/share/libtool/build-aux/$(basename ${i})" ]; then
-					cp -vf /usr/share/libtool/build-aux/$(basename ${i}) $(dirname ${i})
-				fi
-			fi
-		done
-	fi
+	for i in $(find %{DIR_SRC} -name config.guess -or -name config.sub); do
+		if [ -e "/usr/share/libtool/build-aux/$(basename ${i})" ]; then
+			cp -vf /usr/share/libtool/build-aux/$(basename ${i}) $(dirname ${i})
+		fi
+	done
 end
 
 def MACRO_PATCHES
@@ -183,9 +179,6 @@ build
 
 		# Run custom commands.
 		%{prepare_cmds}
-
-		# Fix outdated autotools on aarch64
-		%{MACRO_FIX_AUTOTOOLS}
 	end
 
 	def prepare_cmds