coreutils: updated to 8.20 (fixes FS#50)

- added new deps: acl, libcap
- fix to avoid crosscompile make-prime-list
- fix to avoid rebuild manpages

diff --git a/coreutils/.md5sum b/coreutils/.md5sum
index bbc880dfb491233cc8abd88d3dbedc03ba61d2e9..f8bdcdfa08406d8776f1d6ae94413d18d2ed5e21 100644 (file)
--- a/coreutils/.md5sum
+++ b/coreutils/.md5sum
@@ -1,3 +1,2 @@
-1a01231a2f3ed37c0efc073ccdda9375  coreutils-8.19.tar.xz
-2ccdd9160da6f39bd226c0e3f3953304  coreutils-8.19_manpages.tar.xz
+3d69af8f561fce512538a9fe85f147ff  coreutils-8.20.tar.xz
 e14ef9dd59a7e6c7f3ae706771964d75  coreutils-uname.patch

diff --git a/coreutils/Pkgfile b/coreutils/Pkgfile
index a3dcd6aa3fdaf6b4b4373f9128bfe7ce67bb2945..2a519e0739452701d9c7d701be1847800b19deea 100644 (file)
--- a/coreutils/Pkgfile
+++ b/coreutils/Pkgfile
@@ -2,19 +2,18 @@
 # URL: http://www.gnu.org/software/coreutils/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
-# Depends on: libgmp
+# Depends on: libgmp acl libcap
 
 name=coreutils
-version=8.19
+version=8.20
 release=1
-source=(http://ftp.gnu.org/pub/gnu/$name/$name-$version.tar.xz
-        coreutils-uname.patch
-        http://crux-arm.nu/files/distfiles/coreutils-8.19_manpages.tar.xz)
+source=(http://ftp.gnu.org/pub/gnu/$name/$name-$version.tar.xz \
+        $name-uname.patch)
 
 build() {
   cd $name-$version
-  patch -p1 -i $SRC/coreutils-uname.patch
-  sed "s|SUBDIRS = lib src doc man po tests gnulib-tests|SUBDIRS = lib src tests gnulib-tests|g" -i Makefile.in
+
+  patch -p1 -i $SRC/$name-uname.patch
 
   cat > config.cache <<EOF
 ac_cv_search_clock_gettime=no
@@ -29,25 +28,37 @@ gl_cv_func_wcrtomb_retval=yes
 gl_cv_func_wctob_works=yes
 EOF
 
-  DEFAULT_POSIX2_VERSION=199209 \
-  GPERF=false \
+  export FORCE_UNSAFE_CONFIGURE=1
+
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
-              --mandir=/usr/man \
               --libexecdir=/usr/lib \
+              --mandir=/usr/man \
               --disable-nls \
               --disable-assert \
-              --disable-libcap \
-              --disable-xattr \
               --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
+
   make
   make DESTDIR=$PKG install
 
   install -d $PKG/bin
   mv $PKG/usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo,false,ln,ls,mkdir,sleep} $PKG/bin
   mv $PKG/usr/bin/{mknod,mv,pwd,readlink,rm,rmdir,stty,sync,touch,true,uname} $PKG/bin
-  mv $SRC/usr/man $PKG/usr/
+  rm -r $PKG/usr/share
 }