diff options
Diffstat (limited to 'tools/coreutils')
| -rw-r--r-- | tools/coreutils/Makefile | 12 | ||||
| -rw-r--r-- | tools/coreutils/patches/000-bootstrap.patch | 20 |
2 files changed, 19 insertions, 13 deletions
diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile index 69d1dcbd37..f55fdcc1b2 100644 --- a/tools/coreutils/Makefile +++ b/tools/coreutils/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coreutils PKG_CPE_ID:=cpe:/a:gnu:coreutils -PKG_VERSION:=9.3 +PKG_VERSION:=9.5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/coreutils -PKG_HASH:=a33d2c0bc49be3c79a4794944dcd87103bf497b53a14bafcd431c8ca53975252 +PKG_HASH:=767ae6a22950ec42f3ba5f7c1de79dd27800ee8e9b8642da5dedb5974a1741e5 HOST_BUILD_PARALLEL := 1 @@ -22,7 +22,13 @@ include $(INCLUDE_DIR)/host-build.mk export GNULIB_SRCDIR:=$(HOST_GNULIB_SRCDIR) +HOST_GNULIB_SKIP := \ + lib/nstrftime.c \ + lib/fprintftime.c \ + lib/locale.in.h + HOST_CONFIGURE_ARGS += \ + --disable-year2038 \ --enable-install-program=$(subst $(space),$(comma),$(strip $(PKG_PROGRAMS))) HOST_MAKE_FLAGS += \ @@ -50,7 +56,7 @@ 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 + $(foreach src,$(HOST_GNULIB_SKIP),mv -f $(HOST_BUILD_DIR)/$(src)~ $(HOST_BUILD_DIR)/$(src) || true; ) $(call Host/Configure/Default) endef diff --git a/tools/coreutils/patches/000-bootstrap.patch b/tools/coreutils/patches/000-bootstrap.patch index 91be9d338a..68db19084f 100644 --- a/tools/coreutils/patches/000-bootstrap.patch +++ b/tools/coreutils/patches/000-bootstrap.patch @@ -1,6 +1,6 @@ --- a/bootstrap +++ b/bootstrap -@@ -278,7 +278,7 @@ check_exists() { +@@ -244,7 +244,7 @@ check_exists() { ($2 --version </dev/null) fi else @@ -9,7 +9,7 @@ fi test $? -lt 126 -@@ -563,7 +563,7 @@ p +@@ -309,7 +309,7 @@ p q' get_version() { @@ -18,7 +18,7 @@ $app --version >/dev/null 2>&1 || { $app --version; return 1; } -@@ -620,13 +620,13 @@ check_versions() { +@@ -366,13 +366,13 @@ check_versions() { if [ "$req_ver" = "-" ]; then # Merely require app to exist; not all prereq apps are well-behaved # so we have to rely on $? rather than get_version. @@ -34,12 +34,12 @@ if [ ! "$inst_ver" ]; then warn_ "Error: '$app' not found" ret=1 -@@ -923,7 +923,7 @@ version_controlled_file() { - # two just-pre-run programs. +@@ -1157,7 +1157,7 @@ autogen() + # two just-pre-run programs. - # Import from gettext. --with_gettext=yes -+with_gettext=no - grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \ - with_gettext=no + # Import from gettext. +- with_gettext=yes ++ with_gettext=no + grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \ + with_gettext=no |