From e8bdec57fa3f57f6f8e1a57f4cb1054866526286 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 14 Dec 2020 21:45:13 +0000
Subject: Update to libcap-2.46. Update to bc-3.2.4. Update to autoconf-2.70.
 Update to openssl-1.1.1i. Update to Python3-3.9.1. Update to linux-5.9.14.
 Update to bash-5.1 and readline-8.1.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12069 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter08/autoconf.xml  | 4 ++--
 chapter08/bash.xml      | 4 ++--
 chapter08/coreutils.xml | 4 ++++
 chapter08/texinfo.xml   | 8 ++++----
 4 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'chapter08')

diff --git a/chapter08/autoconf.xml b/chapter08/autoconf.xml
index 22e0a1002..23fdf1b75 100644
--- a/chapter08/autoconf.xml
+++ b/chapter08/autoconf.xml
@@ -40,12 +40,12 @@
 
   <sect2 role="installation">
     <title>Installation of Autoconf</title>
-
+<!--
     <para>First, apply a patch fixes several problems that occur with the latest
     perl, libtool, and bash versions.</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&autoconf-fixes-patch;</userinput></screen>
-
+-->
     <para>Prepare Autoconf for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/chapter08/bash.xml b/chapter08/bash.xml
index b8dd5fe40..4ab6f7d81 100644
--- a/chapter08/bash.xml
+++ b/chapter08/bash.xml
@@ -40,9 +40,9 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
-    <para>Incorporate some upstream fixes:</para>
+    <para>First, fix a race condition if using multiple cores:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+<screen><userinput remap="pre">sed -i  '/^bashline.o:.*shmbchar.h/a bashline.o: ${DEFDIR}/builtext.h' Makefile.in</userinput></screen>
 
     <para>Prepare Bash for compilation:</para>
 
diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml
index 55006e1c7..e308d5743 100644
--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@@ -60,6 +60,10 @@
 
 <screen><userinput remap="pre">sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk</userinput></screen>
 
+<para>Fix a problem with autoconf-2.70 in an included gnulib .m4 file:</para>
+
+<screen><userinput remap="pre">echo '# deleted' > m4/std-gnu11.m4</userinput></screen>
+
     <para>Now prepare Coreutils for compilation:</para>
 
 <screen><userinput remap="configure">autoreconf -fiv
diff --git a/chapter08/texinfo.xml b/chapter08/texinfo.xml
index 7257ae5b5..9cbbda6a6 100644
--- a/chapter08/texinfo.xml
+++ b/chapter08/texinfo.xml
@@ -43,13 +43,13 @@
 
     <para>Prepare Texinfo for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --disable-static</userinput></screen>
-
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<!--
     <variablelist>
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
-        <term><parameter>--disable-static</parameter></term>
+        <term><parameter>- -disable-static</parameter></term>
         <listitem>
           <para>In this case, the top-level configure script will complain that
           this is an unrecognized option, but the configure script for
@@ -60,7 +60,7 @@
       </varlistentry>
 
     </variablelist>
-
+-->
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
-- 
cgit v1.2.3-54-g00ecf