From 5c36c8dd60929178059f5fcf3fdb6db3d5cd0dd0 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 8 Feb 2021 19:05:25 +0000 Subject: [PATCH] autoconf: Update automake scripts for riscv64 Signed-off-by: Michael Tremer --- lfs/Config | 3 ++- lfs/autoconf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lfs/Config b/lfs/Config index 31ea8b79ac..ee3dc2365c 100644 --- 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 ed77c46edc..99bae07b70 100644 --- 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) -- 2.39.5