tools/coreutils: bootstrap to local gnulib source

[openwrt/openwrt.git] / tools / coreutils / Makefile

diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile
index 6582b3a27bb40a97d37fb1aad69a8de4e58ae0a5..233ab1585d75af954dd501348d890922628612a4 100644 (file)
--- a/tools/coreutils/Makefile
+++ b/tools/coreutils/Makefile
@@ -7,30 +7,64 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=coreutils
-PKG_VERSION:=8.25
+PKG_CPE_ID:=cpe:/a:gnu:coreutils
+PKG_VERSION:=9.3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/coreutils
-PKG_HASH:=31e67c057a5b32a582f26408c789e11c2e8d676593324849dcf5779296cdce87
+PKG_HASH:=adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa
 
 HOST_BUILD_PARALLEL := 1
 
-BUILD_PROGRAMS = date
+BUILD_PROGRAMS = date readlink touch ln chown ginstall
 
 include $(INCLUDE_DIR)/host-build.mk
 
+export GNULIB_SRCDIR:=$(HOST_GNULIB_SRCDIR)
+
 BUILD_BINS = $(patsubst %,src/%,$(BUILD_PROGRAMS))
 
 HOST_CONFIGURE_ARGS += \
-        --enable-install-program=date
+        --enable-install-program=$(subst $(space),$(comma),$(strip $(BUILD_PROGRAMS)))
 
 HOST_MAKE_FLAGS += \
+       $(AM_TOOL_PATHS_FAKE) \
        PROGRAMS="$(BUILD_BINS)" \
        LIBRARIES= MANS= SUBDIRS=.
 
+define Host/Bootstrap
+       ( \
+               cd $(HOST_BUILD_DIR); \
+               $(AM_TOOL_PATHS_FAKE) \
+               ./bootstrap \
+                       --bootstrap-sync \
+                       --force \
+                       --no-git \
+                       --skip-po \
+                       --gnulib-srcdir=$(GNULIB_SRCDIR) \
+       )
+endef
+
+define Host/Prepare
+       $(call Host/Prepare/Default)
+       $(if $(QUILT),,$(call Host/Bootstrap))
+endef
+
+define Host/Configure
+       $(if $(QUILT),$(call Host/Bootstrap))
+       -$(CP) $(HOST_BUILD_DIR)/lib/time.in.h~ $(HOST_BUILD_DIR)/lib/time.in.h # @GNULIB_TIME@ not defined
+       $(call Host/Configure/Default)
+endef
+
 define Host/Install
        $(INSTALL_DIR) $(1)/bin
-       $(CP) $(patsubst %,$(HOST_BUILD_DIR)/%,$(BUILD_BINS)) $(1)/bin/
+       $(INSTALL_BIN) $(patsubst %,$(HOST_BUILD_DIR)/%,$(BUILD_BINS)) $(1)/bin/
+       ln -sf ginstall $(1)/bin/install
+endef
+
+define Host/Uninstall
+       rm -f $(STAGING_DIR_HOST)/bin/install
+       -$(call Host/Compile/Default,uninstall)
 endef
 
 $(eval $(call HostBuild))