aboutsummaryrefslogtreecommitdiffstats
path: root/chapter08
diff options
context:
space:
mode:
Diffstat (limited to 'chapter08')
-rw-r--r--chapter08/bash.xml4
-rw-r--r--chapter08/make.xml10
2 files changed, 6 insertions, 8 deletions
diff --git a/chapter08/bash.xml b/chapter08/bash.xml
index fa21ab346..4ea981d5b 100644
--- a/chapter08/bash.xml
+++ b/chapter08/bash.xml
@@ -40,10 +40,6 @@
<sect2 role="installation">
<title>Installation of Bash</title>
- <para>First, fix some issues identified upstream:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
-
<para>Prepare Bash for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
diff --git a/chapter08/make.xml b/chapter08/make.xml
index 080ed3989..04abbc695 100644
--- a/chapter08/make.xml
+++ b/chapter08/make.xml
@@ -40,11 +40,13 @@
<sect2 role="installation">
<title>Installation of Make</title>
-<!--
- <para>Again, work around an error caused by glibc-2.27 and later:</para>
-<screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen>
--->
+ <para>First, fix some issues identified upstream:</para>
+
+<screen><userinput remap="pre">sed -e '/ifdef SIGPIPE/,+2 d' \
+ -e '/undef FATAL_SIG/i FATAL_SIG (SIGPIPE);' \
+ -i src/main.c</userinput></screen>
+
<para>Prepare Make for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>