From f1c177f9587a73e995b274d60babc763a4ed2f61 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 5 Aug 2012 14:25:02 +0000
Subject: Upgrade to Glibc-2.16.0. Fixes #3131.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9922 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/diffutils.xml |  4 ++++
 chapter05/gcc-pass1.xml |  6 ++++++
 chapter05/gettext.xml   |  4 ++++
 chapter05/glibc.xml     | 16 ++++------------
 chapter05/m4.xml        |  4 ++++
 chapter05/tar.xml       |  4 ++++
 6 files changed, 26 insertions(+), 12 deletions(-)

(limited to 'chapter05')

diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml
index 62ba35874..94ec7c49c 100644
--- a/chapter05/diffutils.xml
+++ b/chapter05/diffutils.xml
@@ -43,6 +43,10 @@
   <sect2 role="installation">
     <title>Installation of Diffutils</title>
 
+    <para>Fix an incompatibility between this package and Glibc-&glibc-version;:</para>
+
+<screen><userinput remap="pre">sed -i -e '/gets is a/d' lib/stdio.in.h</userinput></screen>
+
     <para>Prepare Diffutils for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 180cdf7ae..0edcd87d2 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -99,6 +99,12 @@ done</userinput></screen>
     prevents unexpected changes to the original files in case the commands are
     inadvertently run twice.  </para>
 
+    <para>GCC doesn't detect stack protection correctly, which causes problems
+    for the build of Glibc-&glibc-version;, so fix that by issuing the following
+    command:</para>
+
+<screen><userinput remap="pre">sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure</userinput></screen>
+
     <para>The GCC documentation recommends building GCC outside of the
     source directory in a dedicated build directory:</para>
 
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index a8b59ea1e..acaeb28bd 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -46,6 +46,10 @@
     <para>For our temporary set of tools, we only need to build and install
     one binary from Gettext.</para>
 
+    <para>Fix an incompatibility between this package and Glibc-&glibc-version;:</para>
+
+<screen><userinput remap="pre">sed -i -e '/gets is a/d' gettext-*/*/stdio.in.h</userinput></screen>
+
     <para>Prepare Gettext for compilation:</para>
 
 <screen><userinput remap="configure">cd gettext-tools
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 53d3d5713..05607b344 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -43,18 +43,6 @@
   <sect2 role="installation">
     <title>Installation of Glibc</title>
 
-     <para>Address a header check that fails due to an incomplete build
-     environment at this point:</para>
-
-    <screen><userinput remap="pre">sed -i 's#$ac_includes_default#\n\n#' sysdeps/i386/configure</userinput></screen>
-
-    <para>Fix a path that is hardcoded:</para>
-
-    <screen><userinput remap="pre">sed -i 's#/var/db#/tools/var/db#' Makeconfig</userinput></screen>
-
-  <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para>
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen>
-
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
 
@@ -75,6 +63,10 @@ cd ../glibc-build</userinput></screen>
   i?86) echo "CFLAGS += -march=i486 -mtune=native" &gt; configparms ;;
 esac</userinput></screen>
 
+    <para>Fix an issue when building Glibc-&glibc-version; with GCC-&gcc-version;:</para>
+
+<screen><userinput remap="pre">sed -i 's/ -lgcc_s//' ../glibc-&glibc-version;/Makeconfig</userinput></screen>
+
     <para>Next, prepare Glibc for compilation:</para>
 
 <screen><userinput remap="configure">../glibc-&glibc-version;/configure                             \
diff --git a/chapter05/m4.xml b/chapter05/m4.xml
index 4be3a0f36..0d4212cc2 100644
--- a/chapter05/m4.xml
+++ b/chapter05/m4.xml
@@ -43,6 +43,10 @@
   <sect2 role="installation">
     <title>Installation of M4</title>
 
+    <para>Fix an incompatibility between this package and Glibc-&glibc-version;:</para>
+
+<screen><userinput remap="pre">sed -i -e '/gets is a/d' lib/stdio.in.h</userinput></screen>
+
     <para>Prepare M4 for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 002dc228f..37439d930 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -43,6 +43,10 @@
   <sect2 role="installation">
     <title>Installation of Tar</title>
 
+    <para>Fix an incompatibility between this package and Glibc-&glibc-version;:</para>
+
+<screen><userinput remap="pre">sed -i -e '/gets is a/d' gnu/stdio.in.h</userinput></screen>
+
     <para>Prepare Tar for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
-- 
cgit v1.2.3-54-g00ecf