[openwrt/openwrt] tools/automake: use make variable to generate aclocal symlinks

LEDE Commits lede-commits at lists.infradead.org
Mon Mar 13 14:59:08 PDT 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a3cf796e7731fb7ce657017ad34e93acf35b038a

commit a3cf796e7731fb7ce657017ad34e93acf35b038a
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Fri Sep 2 14:51:48 2022 -0400

    tools/automake: use make variable to generate aclocal symlinks
    
    Instead of having a somewhat random list of aclocal symlinks
    which are named with the API versioning scheme,
    install a symlink for every API version since 1.11
    (the first release after Automake was moved to git)
    using the API version number from the version of automake
    that is currently in openwrt.
    
    Automake API versioning does not include the patch level number.
    
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
---
 tools/automake/Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index 3a05cc90f8..246e1814b7 100644
--- a/tools/automake/Makefile
+++ b/tools/automake/Makefile
@@ -9,6 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=automake
 PKG_CPE_ID:=cpe:/a:gnu:automake
 PKG_VERSION:=1.15.1
+PKG_API_VERSION:=$(word 2,$(subst ., ,$(PKG_VERSION)))
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/automake
@@ -34,11 +35,13 @@ define Host/Install
 	$(call Host/Compile/Default,install)
 	mv $(STAGING_DIR_HOST)/bin/aclocal $(STAGING_DIR_HOST)/bin/aclocal.real
 	$(INSTALL_BIN) ./files/aclocal $(STAGING_DIR_HOST)/bin
-	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.9
-	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.10
-	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11
-	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.11.6
-	ln -sf aclocal $(STAGING_DIR_HOST)/bin/aclocal-1.15
+	( \
+		api=$(PKG_API_VERSION); \
+		while [ "$$$$api" -ge 11 ]; do \
+			ln -sf aclocal "$(STAGING_DIR_HOST)/bin/aclocal-1.$$$$api"; \
+			api=$$$$(($$$$api - 1)); \
+		done; \
+	)
 endef
 
 define Host/Uninstall




More information about the lede-commits mailing list