]> git.ipfire.org Git - pakfire.git/commitdiff
macros: Don't run MACRO_FIX_AUTOTOOLS all the time any more
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Mar 2023 14:46:32 +0000 (14:46 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Mar 2023 14:46:32 +0000 (14:46 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
macros/build.macro

index 20e70c064a6de22e9ef4ecb99456857c3e60bb10..5b0877fb201f966af9cf15d541bd69a940f01e6c 100644 (file)
@@ -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