From 573b8bff31b1988e9b65598fb9a33c6f1af5b9d4 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Wed, 12 Dec 2012 18:44:55 +0000
Subject: [PATCH] Remove redundant --enable-addons parameter to Glibc's
 configure script. Fixes #3241.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10060 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 5 +++++
 chapter05/glibc.xml     | 9 ---------
 chapter06/glibc.xml     | 1 -
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f881773af..83761b832 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,11 @@
     <listitem>
       <para>2012-12-12</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Remove redundant --enable-addons parameter to
+          Glibc's configure script. Fixes
+          <ulink url="&lfs-ticket-root;3241">#3241</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Update IRC server information.  Fixes
           <ulink url="&lfs-ticket-root;3240">#3240</ulink>. Thanks
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 88fde346d..e3edf9630 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -84,7 +84,6 @@ esac</userinput></screen>
       --host=$LFS_TGT                                 \
       --build=$(../glibc-&glibc-version;/scripts/config.guess) \
       --disable-profile                               \
-      --enable-add-ons                                \
       --enable-kernel=2.6.25                          \
       --with-headers=/tools/include                   \
       libc_cv_forced_unwind=yes                       \
@@ -111,14 +110,6 @@ esac</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><parameter>--enable-add-ons</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use the NPTL add-on as its threading
-          library.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><parameter>--enable-kernel=2.6.25</parameter></term>
         <listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 62f0a67d1..3431ae5d4 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -127,7 +127,6 @@ esac</userinput></screen>
 <screen><userinput remap="configure">../glibc-&glibc-version;/configure  \
     --prefix=/usr          \
     --disable-profile      \
-    --enable-add-ons       \
     --enable-kernel=2.6.25 \
     --libexecdir=/usr/lib/glibc</userinput></screen>