From 8335e5c48b428d6269047354f29112bca77e9f63 Mon Sep 17 00:00:00 2001 From: Matthew Burgess Date: Tue, 3 Apr 2012 21:35:16 +0000 Subject: [PATCH] Upgrade to Coreutils-8.16. Fixes #3048. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9799 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 10 ++++++++++ chapter01/whatsnew.xml | 16 ++++++++++++++-- chapter03/patches.xml | 8 -------- chapter06/coreutils.xml | 13 +++++-------- general.ent | 4 ++-- packages.ent | 6 +++--- patches.ent | 6 +----- 7 files changed, 35 insertions(+), 28 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index d2c9ea010..0e5c38acc 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,16 @@ --> + + 2012-04-03 + + + [matthew] - Upgrade to Coreutils-8.16 and drop the uname patch. + Fixes #3048. + + + + 2012-03-28 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index c1cb214dc..a4de0536a 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -46,9 +46,9 @@ - + @@ -227,6 +227,10 @@ &binutils-build-patch; + + &coreutils-i18n-patch; + + &gcc-startfiles-patch; @@ -244,6 +248,14 @@ bash-4.2-fixes-4.patch + + coreutils-8.15-i18n-1.patch + + + + coreutils-8.15-uname-1.patch + + gcc-4.6.2-cross_compile-1.patch diff --git a/chapter03/patches.xml b/chapter03/patches.xml index a76c88a0e..21ec95b9a 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -50,14 +50,6 @@ - - Coreutils Uname Patch - &coreutils-uname-patch-size;: - - Download: - MD5 sum: &coreutils-uname-patch-md5; - - - Flex GCC-4.4.x Patch - &flex-gcc-patch-size;: diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 1d0edba88..e5513ee65 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -41,14 +41,10 @@ Installation of Coreutils - A known issue with the uname program from - this package is that the -p switch always - returns unknown. The following patch - fixes this behavior for Intel architectures: + Fix a bug in a test case: -case `uname -m` in - i?86 | x86_64) patch -Np1 -i ../&coreutils-uname-patch; ;; -esac +sed -i -e 's/! isatty/isatty/' \ + -e '45i\ || errno == ENOENT' gnulib-tests/test-getlogin.c POSIX requires that programs from Coreutils recognize character boundaries correctly even in multibyte locales. The following patch @@ -64,7 +60,8 @@ esac Now prepare Coreutils for compilation: -./configure --prefix=/usr \ +FORCE_UNSAFE_CONFIGURE=1 ./configure \ + --prefix=/usr \ --libexecdir=/usr/lib \ --enable-no-install-program=kill,uptime diff --git a/general.ent b/general.ent index ff669ffaa..ed00794b6 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + diff --git a/packages.ent b/packages.ent index 20a4c62de..ad5976b42 100644 --- a/packages.ent +++ b/packages.ent @@ -76,10 +76,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index f86b36377..d5d4fd768 100644 --- a/patches.ent +++ b/patches.ent @@ -18,13 +18,9 @@ - + - - - -