From 25e216f65e3552d61678e44b5c382d63146fc6c7 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Mon, 13 Jul 2009 11:22:41 -0400 Subject: [PATCH] coreutils: Updated (6.9 -> 7.4) --- base/coreutils/coreutils.conf | 9 ++++++++- base/coreutils/coreutils.desc | 13 ++++++------ base/coreutils/cross-df-hack.patch | 32 ------------------------------ base/coreutils/no-man.patch.cross | 28 -------------------------- 4 files changed, 14 insertions(+), 68 deletions(-) delete mode 100644 base/coreutils/cross-df-hack.patch delete mode 100644 base/coreutils/no-man.patch.cross diff --git a/base/coreutils/coreutils.conf b/base/coreutils/coreutils.conf index 501b4c906..2bfbc385c 100644 --- a/base/coreutils/coreutils.conf +++ b/base/coreutils/coreutils.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../coreutils/coreutils.conf -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2009 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -14,6 +14,13 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- +if atstage cross; then + # http://bugs.gentoo.org/show_bug.cgi?id=269256 + var_append configcache ' ' 'gl_cv_func_re_compile_pattern_working=yes' + var_append configcache ' ' 'gl_cv_func_rename_trailing_dest_slash_bug=no' + var_append configcache ' ' 'gl_cv_func_rename_trailing_slash_bug=no' +fi + # apply the patches defined in the coreutils.desc var_append patchfiles ' ' "`match_source_file -p patch`" diff --git a/base/coreutils/coreutils.desc b/base/coreutils/coreutils.desc index 3621306fc..122d74a2f 100644 --- a/base/coreutils/coreutils.desc +++ b/base/coreutils/coreutils.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../coreutils/coreutils.desc -[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -32,13 +32,12 @@ [C] base/tool [F] DIETLIBC + [L] GPL [S] Stable -[V] 6.9 +[V] 7.4 [P] X -1-3-5---9 107.100 -[D] 448021350 coreutils-6.9.tar.bz2 ftp://ftp.gnu.org/pub/gnu/coreutils/ - -[D] 552857878 coreutils-6.9-i18n-1.patch http://www.linuxfromscratch.org/patches/downloads/coreutils/ -[D] 426943901 coreutils-6.9-suppress_uptime_kill_su-1.patch http://www.linuxfromscratch.org/patches/downloads/coreutils/ -[D] 27309275 coreutils-6.9-uname-1.patch http://www.linuxfromscratch.org/patches/downloads/coreutils/ +[D] 3372667530 coreutils-7.4.tar.gz ftp://ftp.gnu.org/pub/gnu/coreutils/ +[D] 849798059 coreutils-7.4-i18n-1.patch http://www.linuxfromscratch.org/patches/downloads/coreutils/ +[D] 2617967079 coreutils-7.4-uname-1.patch http://www.linuxfromscratch.org/patches/downloads/coreutils/ diff --git a/base/coreutils/cross-df-hack.patch b/base/coreutils/cross-df-hack.patch deleted file mode 100644 index 152ae86e5..000000000 --- a/base/coreutils/cross-df-hack.patch +++ /dev/null @@ -1,32 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../coreutils/cross-df-hack.patch -# Copyright (C) 2004 - 2006 The T2 SDE 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 --- - -This is a grave hack and will only work on Linux and other systems with -that style fo statfs ... - - - Rene Rebe - ---- ./configure.orig 2004-03-11 09:58:11.000000000 +0100 -+++ ./configure 2005-06-19 20:37:50.000000000 +0200 -@@ -13995,7 +13995,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$cross_compiling" = yes; then -- fu_cv_sys_stat_statfs2_bsize=no -+ fu_cv_sys_stat_statfs2_bsize=yes - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ diff --git a/base/coreutils/no-man.patch.cross b/base/coreutils/no-man.patch.cross deleted file mode 100644 index 46eb2652a..000000000 --- a/base/coreutils/no-man.patch.cross +++ /dev/null @@ -1,28 +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) 2006 The OpenSDE Project -# Copyright (C) 2006 The T2 SDE 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 --- - ---- coreutils-6.4/Makefile.in.orig 2006-10-22 22:36:28.000000000 +0200 -+++ coreutils-6.4/Makefile.in 2006-11-10 18:24:02.000000000 +0100 -@@ -401,7 +401,7 @@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = lib src doc man po tests -+SUBDIRS = lib src doc po tests - EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \ - .gitignore \ - .hgignore \