Changeset 3e80156 for chapter06

Timestamp:

08/03/2010 07:55:09 PM (14 years ago)

Author:

Matthew Burgess <matthew@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

ff1d9e0

Parents:

d7bd6fdc

Message:

Upgrade to Make-3.82. Fixes #2726.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9346 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• glibc.xml (modified) (1 diff)
• make.xml (modified) (1 diff)
• procps.xml (modified) (1 diff)

chapter06/glibc.xml

@@ -96 +96 @@
 
 <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

chapter06/make.xml

@@ -40 +40 @@
   <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>

chapter06/procps.xml

@@ -46 +46 @@
 <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>