From c0262ed5af2a5b97b864f6c2a0a56f731c8a4213 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sun, 16 Aug 2026 13:14:05 +0200 Subject: [PATCH] tools: gnulib: remove stale gl_-prefixed macros from staging Commit c820f097e0 ("tools: gnulib: install .m4 file with gl_ prefix") installed gnulib autoconf macros under gl_-prefixed file names. The scheme was later reverted in commit cda598a595, but the previously installed files were never removed from share/aclocal. As aclocal reads the whole directory, stale gl_*.m4 files can override the current unprefixed macros. This breaks elfutils builds on macOS after the gnulib stable-202507 update, resulting in empty #if expressions in the generated ctype.h. Remove the stale files in Host/Uninstall. Host/Install calls it first, so affected build trees are cleaned up automatically on the next gnulib reinstall. Signed-off-by: Josef Schlehofer Link: https://github.com/openwrt/openwrt/pull/24759 Signed-off-by: Robert Marko --- tools/gnulib/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/gnulib/Makefile b/tools/gnulib/Makefile index 30c070eeb92..e506cdb0e41 100644 --- a/tools/gnulib/Makefile +++ b/tools/gnulib/Makefile @@ -23,6 +23,7 @@ endef define Host/Uninstall rm -rf $(STAGING_DIR_HOST)/bin/gnulib-tool $(STAGING_DIR_HOST)/share/gnulib + rm -f $(STAGING_DIR_HOST)/share/aclocal/gl_*.m4 endef $(eval $(call HostBuild))