[openwrt/openwrt] tools: gnulib: install .m4 file with gl_ prefix

LEDE Commits lede-commits at lists.infradead.org
Wed Dec 3 09:46:53 PST 2025


ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/c820f097e0bede3ec09c62ca9608d915da21e62d

commit c820f097e0bede3ec09c62ca9608d915da21e62d
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Wed Dec 3 18:39:52 2025 +0100

    tools: gnulib: install .m4 file with gl_ prefix
    
    It was found that there is currently a conflict for the cond.m4 that
    is also shipped by automake, making the gnulib one having priority causing
    problem with finding AM_CONDITIONAL macro.
    
    To handle this, install gnulib .m4 file with a gl_ prefix to the
    filename.
    
    This make sure gnulib .m4 file won't have name conflict with automake
    .m4 default files permitting correct autoreconf run of any affected
    package by this.
    
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 tools/gnulib/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/gnulib/Makefile b/tools/gnulib/Makefile
index 1237fad46e..018ff5db14 100644
--- a/tools/gnulib/Makefile
+++ b/tools/gnulib/Makefile
@@ -13,10 +13,15 @@ include $(INCLUDE_DIR)/host-build.mk
 define Host/Configure
 endef
 
+# On installing the .m4 files, we add a gl_ prefix to prevent any conflict with
+# automake. It was found that there is currently a conflict for the cond.m4 that
+# is also shipped by automake, making the gnulib one having priority causing
+# problem with finding AM_CONDITIONAL macro.
 define Host/Install
 	$(call Host/Uninstall)
 	$(INSTALL_DIR) $(1)/share/aclocal
-	$(INSTALL_DATA) $(HOST_BUILD_DIR)/m4/*.m4 $(1)/share/aclocal/
+	$(foreach m4,$(notdir $(wildcard $(HOST_BUILD_DIR)/m4/*.m4)),
+		$(INSTALL_DATA) $(HOST_BUILD_DIR)/m4/$(m4) $(1)/share/aclocal/gl_$(m4))
 	$(CP) $(HOST_BUILD_DIR)/ $(1)/share/gnulib/
 	ln -sf ../share/gnulib/gnulib-tool $(STAGING_DIR_HOST)/bin/gnulib-tool
 endef




More information about the lede-commits mailing list