aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/glibc.xml5
-rw-r--r--chapter06/make.xml10
-rw-r--r--chapter06/procps.xml5
3 files changed, 10 insertions, 10 deletions
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 0166103bd..c4a124a1e 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -96,6 +96,11 @@ unset DL</userinput></screen>
<screen><userinput>patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen>
+ <para>Fix a bug that prevents Glibc from building with versions of Make
+ newer than 3.81.</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-makefile_fix-patch;</userinput></screen>
+
<para>The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:</para>
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 030297684..791908683 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -40,16 +40,6 @@
<sect2 role="installation">
<title>Installation of Make</title>
- <para>First fix some problems that have been identified since
- the last package release:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&make-upstream_fixes-patch;</userinput></screen>
-
- <para>Now, fix a known issue with the test suite that causes one of the
- tests to fail:</para>
-
-<screen><userinput remap="pre">sed -i -e 's/-j/ -j/' tests/scripts/features/recursion</userinput></screen>
-
<para>Prepare Make for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 40c73cbf4..0815ae716 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -45,6 +45,11 @@
<screen><userinput remap="pre">patch -Np1 -i ../&procps-watch-patch;</userinput></screen>
+ <para>Fix a bug in the Makefile, which prevents procps from building with
+ make-&make-version;:</para>
+
+<screen><userinput remap="pre">sed -i -e 's@\*/module.mk@proc/module.mk ps/module.mk@' Makefile</userinput></screen>
+
<para>Compile the package:</para>
<screen><userinput remap="make">make</userinput></screen>