From 9a314770aab835019d2a13460f7438e225685006 Mon Sep 17 00:00:00 2001 From: Matthew Burgess Date: Fri, 6 Nov 2009 20:27:20 +0000 Subject: [PATCH] Upgrade to Glibc-2.11. Fixes #2509. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9095 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 4 ++++ chapter01/whatsnew.xml | 8 ++------ chapter03/packages.xml | 9 --------- chapter03/patches.xml | 8 -------- chapter05/glibc.xml | 15 --------------- chapter06/glibc.xml | 31 ------------------------------- packages.ent | 11 +++-------- patches.ent | 5 ----- 8 files changed, 9 insertions(+), 82 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 66acfdcf6..4dd88de6c 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,10 @@ 2009-11-06 + + [matthew] Upgraded to Glibc-2.11. Fixes + #2509. + [matthew] Upgraded to latest upstream patches for Bash. diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 79369d792..450e0bba8 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -79,9 +79,9 @@ - + @@ -222,10 +222,6 @@ coreutils-7.6-uname-1.patch - - glibc-2.10.1-binutils-1.patch - - gzip-1.3.13-zdiff-1.patch diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 23bf32ab4..83328f006 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -194,15 +194,6 @@ - - Glibc LibIDN add-on (&glibc-libidn-version;) - &glibc-libidn-size;: - - Home page: - Download: - MD5 sum: &glibc-libidn-md5; - - - GMP (&gmp-version;) - &gmp-size;: diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 5f2679b29..971987ea8 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -98,14 +98,6 @@ - - Glibc Binutils Patch - &glibc-binutils-patch-size;: - - Download: - MD5 sum: &glibc-binutils-patch-md5; - - - Grep Debian Patch - &grep-debian-patch-size;: diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 1f66d03dc..e3a5b6ee8 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -43,21 +43,6 @@ Installation of Glibc - Apply a patch so that Glibc will build against - Binutils-&binutils-version;: - -patch -Np1 -i ../&glibc-binutils-patch; - - - Fix an error in the constants that get passed to the futex system - call in some cases, causing certain pthread_mutex operations to fail: - -cp -v nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S{,.orig} -sed -e 's/FUTEX_WAIT\( | FUTEX_CLOCK_REALTIME, reg\)/FUTEX_WAIT_BITSET\1/' \ - <nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S.orig \ - >nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S - The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory: diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 128e86ee0..b00033fac 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -61,15 +61,6 @@ Glibc autoconf tests would give false results and defeat the goal of achieving a clean build. - The glibc-libidn tarball adds support for internationalized domain - names (IDN) to Glibc. Many programs that support IDN require the full - libidn library, not this add-on (see - ). - Unpack the tarball from within the Glibc source directory: - -tar -xvf ../glibc-libidn-&glibc-version;.tar.bz2 -mv -v glibc-libidn-&glibc-version; libidn - - Fix an error in the constants that get passed to the futex system - call in some cases, causing certain pthread_mutex operations to fail: - - -sed -i \ - -e 's/FUTEX_WAIT\( | FUTEX_CLOCK_REALTIME, reg\)/FUTEX_WAIT_BITSET\1/' \ - nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S - The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory: diff --git a/packages.ent b/packages.ent index 8cf24e9c1..bc5092845 100644 --- a/packages.ent +++ b/packages.ent @@ -189,20 +189,15 @@ - - + + - + - - - - - diff --git a/patches.ent b/patches.ent index 32c7b3f18..55aa239c1 100644 --- a/patches.ent +++ b/patches.ent @@ -50,11 +50,6 @@ - - - - -