From 26f8a3874b1d1a393cbd081b4e5a05a5aa3b534c Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Sun, 6 Oct 2024 04:13:16 -0400 Subject: [PATCH] tools/coreutils: use automake during bootstrap This was previously not possible because part of the source code for coreutils in the form of extra gnulib modules was missing from the release distribution. Now that the local modules from coreutils source is included in coreutils releases, the bootstrap script can be ran without skipping automake in the autoreconf stage after importing modules by using fake paths to each autotools program, and instead use the real paths to our modified autotools. Because we do not require tools for building documentation, continue to fake the paths to autopoint and gtkdocize. Remove the skipping of imports of some source files which is no longer necessary. Tested-by: Georgi Valkov # macOS Signed-off-by: Michael Pratt Link: https://github.com/openwrt/openwrt/pull/16522 Signed-off-by: Robert Marko --- tools/coreutils/Makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile index d1948042b9..3dc82afafc 100644 --- a/tools/coreutils/Makefile +++ b/tools/coreutils/Makefile @@ -23,14 +23,6 @@ include $(INCLUDE_DIR)/host-build.mk export GNULIB_SRCDIR:=$(HOST_GNULIB_SRCDIR) HOST_GNULIB_SKIP := \ - lib/c++defs.h \ - lib/realloc.c \ - lib/reallocarray.c \ - lib/savedir.c \ - lib/fcntl.in.h \ - lib/stdio.in.h \ - lib/stdlib.in.h \ - lib/se-selinux.in.h \ lib/iconv_open-aix.gperf \ lib/iconv_open-hpux.gperf \ lib/iconv_open-irix.gperf \ @@ -42,14 +34,14 @@ HOST_CONFIGURE_ARGS += \ --enable-install-program=$(subst $(space),$(comma),$(strip $(PKG_PROGRAMS))) HOST_MAKE_FLAGS += \ - $(AM_TOOL_PATHS_FAKE) \ + $(AM_TOOL_PATHS) AUTOPOINT="$(TRUE)" GTKDOCIZE="$(TRUE)" \ PROGRAMS="$(patsubst %,src/%,$(PKG_PROGRAMS))" \ LIBRARIES= MANS= SUBDIRS=. define Host/Bootstrap ( \ cd $(HOST_BUILD_DIR); \ - $(AM_TOOL_PATHS_FAKE) \ + $(AM_TOOL_PATHS) AUTOPOINT="$(TRUE)" GTKDOCIZE="$(TRUE)" \ ./bootstrap \ --bootstrap-sync \ --force \