From 3bce8fdfe8fa45a281e75bc02678166c58d37e61 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 28 Jan 2011 01:26:09 +0000 Subject: [PATCH] Add a sed that modifies incorrect defines in glibc git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9452 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 16 ++++++++++++++-- chapter06/glibc.xml | 5 +++++ general.ent | 4 ++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 29568b18a..98ed99345 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,13 +36,25 @@ --> + + 2011-01-27 + + + [bdubbs] Add a sed that modifies incorrect defines in + glibc. Thanks to Bryan Kadzban for identifying the proper fix. + Fixes + #2820. + + + + 2011-01-25 [bdubbs] Add a note about optionally building popt before pkg-config. Fixes - #2781. + #2781. @@ -52,7 +64,7 @@ [bdubbs] Move chroot man page to man8. Fixes - #2782. + #2782. diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 693d0d993..8c4721020 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -96,6 +96,11 @@ unset DL patch -Np1 -i ../&glibc-gcc_fix-patch; + Fix a stack imbalance that occurs under some conditions: + +sed -i '195,213 s/PRIVATE_FUTEX/FUTEX_CLOCK_REALTIME/' \ +nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timed{rd,wr}lock.S + The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory: diff --git a/general.ent b/general.ent index 6d327df50..da2c72006 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + +