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 <gvalkov@gmail.com> # macOS Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/16522 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
199afe9ef7
commit
26f8a3874b
|
@ -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 \
|
||||
|
|
Loading…
Reference in New Issue