Skip to content

Commit 6691609

Browse files
mcpratPolynomialDivision
authored andcommitted
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 <[email protected]> Fixes: d19f8bc ("tools/gnulib: update to branch stable-202501") Signed-off-by: Michael Pratt <[email protected]> Link: openwrt/openwrt#19606 Signed-off-by: Nick Hainke <[email protected]>
1 parent d802e63 commit 6691609

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tools/bison/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ include $(INCLUDE_DIR)/host-build.mk
2121
HOST_CONFIGURE_ARGS += --enable-threads=posix --disable-nls
2222

2323
define Host/Install
24-
$(call Host/Install/Default)
24+
$(call Host/Compile/Default,install aclocal_DATA=) # Macro provided by gnulib
2525
$(INSTALL_BIN) ./scripts/yacc $(STAGING_DIR_HOST)/bin/yacc
2626
endef
2727

2828
define Host/Uninstall
2929
rm -f $(STAGING_DIR_HOST)/bin/yacc
30-
-$(call Host/Compile/Default,uninstall)
30+
-$(call Host/Compile/Default,uninstall aclocal_DATA=) # Macro provided by gnulib
3131
endef
3232

3333
$(eval $(call HostBuild))

0 commit comments

Comments
 (0)