mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2025-12-10 06:24:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tools: gnulib: install .m4 file with gl_ prefix
Some checks are pending
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Waiting to run
Details
Build host tools / Build host tools for linux and macos based systems (push) Waiting to run
Details

Browse source 
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@gmail.com>
This commit is contained in:
Christian Marangi 2025-12-03 18:39:52 +01:00
parent 5205c0c426
commit c820f097e0
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/gnulib/Makefile
View file

@ -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