From 20dd3342f7a9b550c6ce567f0fd4ed96c70c6fbe Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 30 Aug 2013 14:37:31 +0000 Subject: [PATCH] Fix an upstream problem in glibc Update to linix-3.10.10 git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10330 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter05/glibc.xml | 4 ++++ chapter06/glibc.xml | 5 +++++ general.ent | 4 ++-- packages.ent | 6 +++--- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 94928996d..0691ddbfb 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -52,6 +52,10 @@ su -c 'cp -v sunrpc/rpc/*.h /usr/include/rpc' fi + An upstream change needs to be reverted: + +sed -i -e 's/static __m128i/inline &/' sysdeps/x86_64/multiarch/strstr.c + 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 485f0d7d4..45102933e 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -61,6 +61,11 @@ Glibc autoconf tests would give false results and defeat the goal of achieving a clean build. + An upstream change needs to be reverted: + +sed -i -e 's/static __m128i/inline &/' sysdeps/x86_64/multiarch/strstr.c + + 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 2ef4cfe06..250017cd5 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + diff --git a/packages.ent b/packages.ent index b89409fdc..5d1787162 100644 --- a/packages.ent +++ b/packages.ent @@ -339,12 +339,12 @@ - + - + - +