From: Victor Martinez <pitillo@ono.com>
Date: Tue, 14 Feb 2017 17:14:32 +0000 (+0000)
Subject: coreutils: updated to 8.26
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=58a124069adc355499a38cc96b29621c885860fc;p=crossrootfs.git

coreutils: updated to 8.26
---

diff --git a/coreutils/.footprint b/coreutils/.footprint
index 73512d4..2de41b3 100644
--- a/coreutils/.footprint
+++ b/coreutils/.footprint
@@ -27,6 +27,8 @@ drwxr-xr-x	root/root	bin/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/[
+-rwxr-xr-x	root/root	usr/bin/b2sum
+-rwxr-xr-x	root/root	usr/bin/base32
 -rwxr-xr-x	root/root	usr/bin/base64
 -rwxr-xr-x	root/root	usr/bin/basename
 -rwxr-xr-x	root/root	usr/bin/chroot
diff --git a/coreutils/.md5sum b/coreutils/.md5sum
index 0bbbb7a..0e3d35f 100644
--- a/coreutils/.md5sum
+++ b/coreutils/.md5sum
@@ -1,2 +1,3 @@
-40efdbce865d2458d8da0a9dcee7c16c  coreutils-8.24.tar.xz
+a2de56a7c68e192d3e8a3a4a8bc0d826  coreutils-8.26-Fix-cross.patch
+d5aa2072f662d4118b9f4c63b94601a6  coreutils-8.26.tar.xz
 e14ef9dd59a7e6c7f3ae706771964d75  coreutils-uname.patch
diff --git a/coreutils/Pkgfile b/coreutils/Pkgfile
index a673cea..8e99eea 100644
--- a/coreutils/Pkgfile
+++ b/coreutils/Pkgfile
@@ -5,15 +5,16 @@
 # Depends on: libgmp acl libcap
 
 name=coreutils
-version=8.24
-release=2
+version=8.26
+release=1
 source=(http://ftp.gnu.org/pub/gnu/$name/$name-$version.tar.xz \
-        $name-uname.patch)
+        $name-uname.patch $name-$version-Fix-cross.patch)
 
 build() {
   cd $name-$version
 
   patch -p1 -i $SRC/$name-uname.patch
+  patch -p1 -i $SRC/$name-$version-Fix-cross.patch
 
   cat > config.cache <<EOF
 ac_cv_search_clock_gettime=no
@@ -30,6 +31,10 @@ EOF
 
   export FORCE_UNSAFE_CONFIGURE=1
 
+  # fix to avoid build manpages
+  sed "s|UBDIRS = po . gnulib-tests|UBDIRS = . gnulib-tests|g" -i Makefile.am
+  sed 's|include $(top_srcdir)/man/local.mk||g' -i Makefile.am
+
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
@@ -39,21 +44,6 @@ EOF
               --enable-no-install-program=uptime,kill,chcon,runcon,groups \
               --cache-file=config.cache
 
-  # fix to avoid crosscompile make-prime-list
-  sed '/src_make_prime_list/d' -i Makefile
-  depbase=`echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`
-  gcc -std=gnu99  -I. -I./lib  -Ilib -I./lib -Isrc -I./src \
-      -fdiagnostics-show-option -funit-at-a-time \
-      -g -O2 -MT src/make-prime-list.o -MD -MP -MF $depbase.Tpo \
-      -c -o src/make-prime-list.o src/make-prime-list.c
-  mv -f $depbase.Tpo $depbase.Po
-  gcc -std=gnu99 -fdiagnostics-show-option -funit-at-a-time \
-      -g -O2 -Wl,--as-needed  -o src/make-prime-list src/make-prime-list.o
-
-  # fix to avoid rebuild manpages
-  sed 's|SUFFIXES: .1|SUFFIXES: |' -i Makefile
-  sed 's|man1_MANS =.*|man1_MANS =|g' -i Makefile
-
   make
   make DESTDIR=$PKG install
 
diff --git a/coreutils/coreutils-8.26-Fix-cross.patch b/coreutils/coreutils-8.26-Fix-cross.patch
new file mode 100644
index 0000000..df96192
--- /dev/null
+++ b/coreutils/coreutils-8.26-Fix-cross.patch
@@ -0,0 +1,11 @@
+--- coreutils-8.26.orig/src/local.mk    2017-02-14 15:50:02.555173014 +0000
++++ coreutils-8.26/src/local.mk 2017-02-14 15:50:54.405173651 +0000
+@@ -645,7 +645,7 @@ check-duplicate-no-install: src/tr
+ 
+ # Use the just-built 'ginstall', when not cross-compiling.
+ if CROSS_COMPILING
+-cu_install_program = @INSTALL_PROGRAM@
++cu_install_program = @INSTALL@ 
+ else
+ cu_install_program = src/ginstall
+ endif