[openwrt/openwrt] tools: bison: do not install or uninstall macros

LEDE Commits lede-commits at lists.infradead.org
Wed Jul 30 14:06:58 PDT 2025


nick pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/66916096f3804f8c424828be9ad67f7812569a16

commit 66916096f3804f8c424828be9ad67f7812569a16
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Wed Jul 30 14:44:16 2025 -0400

    tools: bison: do not install or uninstall macros
    
    There is a clobbering between bison and gnulib for installing
    the macro file bison-i18n.m4 where gnulib has a newer version
    while bison will replace it with an outdated version if built afterward.
    
    Other builds depend on the changes made to the bison-i18n.m4 file and are
    only included using aclocal unless other modifications are made in each case
    in order to force imported macros from gnulib to override aclocal macros.
    
    Gnulib is integrated within bison, however it is not with a bootstrap script
    and there is already a reverse dependency between the two, where bison
    is indirectly required for gnulib to start building. Therefore, do not allow
    the building or cleaning of bison to install or uninstall m4 files.
    
    Reported-by: Tianling Shen <cnsztl at immortalwrt.org>
    Fixes: d19f8bc199 ("tools/gnulib: update to branch stable-202501")
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
    Link: https://github.com/openwrt/openwrt/pull/19606
    Signed-off-by: Nick Hainke <vincent at systemli.org>
---
 tools/bison/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/bison/Makefile b/tools/bison/Makefile
index 97d34b5a16..4cb0faf336 100644
--- a/tools/bison/Makefile
+++ b/tools/bison/Makefile
@@ -21,13 +21,13 @@ include $(INCLUDE_DIR)/host-build.mk
 HOST_CONFIGURE_ARGS += --enable-threads=posix --disable-nls
 
 define Host/Install
-	$(call Host/Install/Default)
+	$(call Host/Compile/Default,install aclocal_DATA=) # Macro provided by gnulib
 	$(INSTALL_BIN) ./scripts/yacc $(STAGING_DIR_HOST)/bin/yacc
 endef
 
 define Host/Uninstall
 	rm -f $(STAGING_DIR_HOST)/bin/yacc
-	-$(call Host/Compile/Default,uninstall)
+	-$(call Host/Compile/Default,uninstall aclocal_DATA=) # Macro provided by gnulib
 endef
 
 $(eval $(call HostBuild))




More information about the lede-commits mailing list