From 31e4b441b319c731d12a0cd4f7b495bdbe9b03da Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Sun, 23 Dec 2012 14:50:44 +0100 Subject: [PATCH] coreutils: Updated (8.19 -> 8.20) --- base/coreutils/coreutils.conf | 19 +++++++++++++++++++ base/coreutils/coreutils.desc | 4 ++-- base/coreutils/install.patch | 18 +++++++++--------- base/coreutils/no_man.patch.cross | 27 --------------------------- 4 files changed, 30 insertions(+), 38 deletions(-) delete mode 100644 base/coreutils/no_man.patch.cross diff --git a/base/coreutils/coreutils.conf b/base/coreutils/coreutils.conf index 5bbcec2e5..88605ccd2 100644 --- a/base/coreutils/coreutils.conf +++ b/base/coreutils/coreutils.conf @@ -14,6 +14,22 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- +# cross-compile: build a 'make-prime-list' which runs on the build host +# idea taken from Cross Linux From Scratch (http://cross-lfs.org) +hostcc_make_prime_list() { + cp -v Makefile{,.orig} + sed -e '/src_make_prime_list/d' \ + -e '/hostname.1/d' Makefile.orig > Makefile + depbase=`echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\ + $HOSTCC -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 + $HOSTCC -std=gnu99 -fdiagnostics-show-option -funit-at-a-time -g -O2 \ + -Wl,--as-needed -o src/make-prime-list src/make-prime-list.o +} + if atstage cross; then # http://bugs.gentoo.org/show_bug.cgi?id=269256 var_append configcache ' ' 'gl_cv_func_re_compile_pattern_working=yes' @@ -22,6 +38,9 @@ if atstage cross; then # cannot be tested while cross-compiling var_append configcache ' ' 'gl_cv_func_fstatat_zero_flag=yes' + + # 'make-prime-list' needs to be run on the build host + hook_add premake 5 'hostcc_make_prime_list' fi # apply the patches defined in the coreutils.desc diff --git a/base/coreutils/coreutils.desc b/base/coreutils/coreutils.desc index 3935bc048..852224be1 100644 --- a/base/coreutils/coreutils.desc +++ b/base/coreutils/coreutils.desc @@ -34,7 +34,7 @@ [L] GPL [S] Stable -[V] 8.19 +[V] 8.20 [P] X -1-3-5---9 107.100 -[D] 2412253278 coreutils-8.19.tar.xz ftp://ftp.gnu.org/pub/gnu/coreutils/ +[D] 241134348 coreutils-8.20.tar.xz ftp://ftp.gnu.org/pub/gnu/coreutils/ diff --git a/base/coreutils/install.patch b/base/coreutils/install.patch index 4c6958f0a..ec5d571a8 100644 --- a/base/coreutils/install.patch +++ b/base/coreutils/install.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../coreutils/install.patch -# Copyright (C) 2010 The OpenSDE Project +# Copyright (C) 2010 - 2012 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -25,14 +25,14 @@ to be FHS compliant. Without this fix those binaries will get installed at both locations, because on cross-stage the filter is working properly. ---- coreutils-7.4/src/Makefile.in.orig 2010-03-31 19:31:40.000000000 +0200 -+++ coreutils-7.4/src/Makefile.in 2010-03-31 19:34:19.000000000 +0200 -@@ -1627,7 +1627,7 @@ - # translation inhibits printing of UTF-8 names, just skip this test. - au_dotdot = authors-dotdot - au_actual = authors-actual --@CROSS_COMPILING_FALSE@cu_install_program = ./ginstall +--- coreutils-8.20/Makefile.in.orig 2012-10-23 18:26:32.000000000 +0200 ++++ coreutils-8.20/Makefile.in 2012-12-23 14:20:47.680155027 +0100 +@@ -3313,7 +3313,7 @@ + + pm = progs-makefile + pr = progs-readme +-@CROSS_COMPILING_FALSE@cu_install_program = src/ginstall +@CROSS_COMPILING_FALSE@cu_install_program = install - # Use the just-built ./ginstall, when not cross-compiling. + # Use the just-built 'ginstall', when not cross-compiling. @CROSS_COMPILING_TRUE@cu_install_program = @INSTALL_PROGRAM@ diff --git a/base/coreutils/no_man.patch.cross b/base/coreutils/no_man.patch.cross deleted file mode 100644 index 4433e1c11..000000000 --- a/base/coreutils/no_man.patch.cross +++ /dev/null @@ -1,27 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../coreutils/no_man.patch.cross -# Copyright (C) 2009 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./Makefile.in.orig 2009-07-15 21:24:47.000000000 +0300 -+++ ./Makefile.in 2009-07-15 21:25:11.000000000 +0300 -@@ -936,7 +936,7 @@ - - # Some tests always need root privileges, others need them only sometimes. - ALL_RECURSIVE_TARGETS = install-root check-root distcheck-hook --SUBDIRS = lib src doc man po tests gnulib-tests -+SUBDIRS = lib src doc po tests gnulib-tests - changelog_etc = \ - ChangeLog-2005 \ - ChangeLog-2006 \