autoconf: Update automake scripts for riscv64

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

diff --git a/lfs/Config b/lfs/Config
index 31ea8b79ac55038f8e10348c25e22446d3fe77d3..ee3dc2365cf987e53b8dd3deed956e1d7c9b97e9 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -311,7 +311,8 @@ endef
 ifeq "$(BUILD_ARCH)" "$(filter $(BUILD_ARCH),aarch64 riscv64)"
 define UPDATE_AUTOMAKE
        for i in $$(find $(DIR_APP) -name config.guess -o -name config.sub); do \
-               cp -vf /usr/share/automake*/$$(basename $${i}) $${i}; \
+               cp -vf /usr/share/automake*/$$(basename $${i}) $${i} || \
+                       cp -vf $(TOOLS_DIR)/share/automake*/$$(basename $${i}) $${i}; \
        done
 endef
 endif

diff --git a/lfs/autoconf b/lfs/autoconf
index ed77c46edc7c81e053f9f114f8f0d57a6e488dc0..99bae07b709634f620fcb404943562f782cac763 100644 (file)
--- a/lfs/autoconf
+++ b/lfs/autoconf
@@ -69,9 +69,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+       $(UPDATE_AUTOMAKE)
        cd $(DIR_APP) && ./configure \
                --prefix=/usr
-
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)