From 3e801560a71bead93f49fdcc665962563a71d9ea Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Tue, 3 Aug 2010 19:55:09 +0000
Subject: [PATCH] Upgrade to Make-3.82. Fixes #2726.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9346 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 10 ++++++++++
 chapter01/whatsnew.xml  | 11 +++++++++--
 chapter03/patches.xml   | 16 ++++++++--------
 chapter05/glibc.xml     |  5 +++++
 chapter06/glibc.xml     |  5 +++++
 chapter06/make.xml      | 10 ----------
 chapter06/procps.xml    |  5 +++++
 general.ent             |  4 ++--
 packages.ent            |  6 +++---
 patches.ent             |  8 ++++----
 10 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index bc3d3453c..533248c37 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
 
 -->
 
+    <listitem>
+      <para>2010-08-03</para>
+      <itemizedlist>
+         <listitem>
+           <para>[matthew] - Upgrade to Make-3.82. Fixes
+           <ulink url="&lfs-ticket-root;2726">#2726</ulink>.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2010-07-26</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0b069ec72..039e72456 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -124,9 +124,9 @@
     <listitem>
       <para>M4 &m4-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Make &make-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Man-DB &man-db-version;</para>
     </listitem>
@@ -228,6 +228,10 @@
       <para>expect-&expect-version;-no_tk-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>glibc-&glibc-version;-makefile_fix-1.patch</para>
+    </listitem>
+
     <listitem>
       <para>MPC-&mpc-version;</para>
     </listitem>
@@ -253,6 +257,9 @@
     <listitem>
       <para>grep-2.5.4-debian_fixes-1.patch</para>
     </listitem>
+    <listitem>
+      <para>make-3.81-upstream_fixes-1.patch</para>
+    </listitem>
     <listitem>
       <para>perl-5.10.1-utf8-1.patch</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 2be236344..f1fbcd192 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -106,6 +106,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Glibc Makefile Fix Patch - <token>&glibc-makefile_fix-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-makefile_fix-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-makefile_fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
 <!--
     <varlistentry>
       <term>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term>
@@ -131,14 +139,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Make Upstream Fixes Patch - <token>&make-upstream_fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&make-upstream_fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&make-upstream_fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Man-DB Upstream Fix Assertion Patch - <token>&man-db-upstream_fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index e9578cf75..f9481cf73 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -47,6 +47,11 @@
 
 <screen><userinput remap="pre">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/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>
diff --git a/general.ent b/general.ent
index e0016d7a0..d22045493 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20100726">
-<!ENTITY releasedate "July 26, 2010">
+<!ENTITY version "SVN-20100803">
+<!ENTITY releasedate "August 3, 2010">
 <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.7">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 84724fa0b..a053c2507 100644
--- a/packages.ent
+++ b/packages.ent
@@ -331,10 +331,10 @@
 <!ENTITY m4-ch6-du "14.2 MB">
 <!ENTITY m4-ch6-sbu "0.4 SBU">
 
-<!ENTITY make-version "3.81">
-<!ENTITY make-size "1,125 KB">
+<!ENTITY make-version "3.82">
+<!ENTITY make-size "1,213 KB">
 <!ENTITY make-url "&gnu;make/make-&make-version;.tar.bz2">
-<!ENTITY make-md5 "354853e0b2da90c527e35aabb8d6f1e6">
+<!ENTITY make-md5 "1a11100f3c63fcf5753818e59d63088f">
 <!ENTITY make-home "&gnu-software;make/">
 <!ENTITY make-ch5-du "9.6 MB">
 <!ENTITY make-ch5-sbu "0.1 SBU">
diff --git a/patches.ent b/patches.ent
index cf1ddda13..02a687cc0 100644
--- a/patches.ent
+++ b/patches.ent
@@ -58,6 +58,10 @@
 <!ENTITY glibc-gcc_fix-patch-md5 "d1f28cb98acb9417fe52596908bbb9fd">
 <!ENTITY glibc-gcc_fix-patch-size "2.5 KB">
 
+<!ENTITY glibc-makefile_fix-patch "glibc-&glibc-version;-makefile_fix-1.patch">
+<!ENTITY glibc-makefile_fix-patch-md5 "0ef634ac78e582f45d0e7643bfda7505">
+<!ENTITY glibc-makefile_fix-patch-size "1 KB">
+
 
 <!ENTITY grub-inode-patch "grub-&grub-version;-256byte_inode-1.patch">
 <!ENTITY grub-inode-patch-md5 "2482bef9c1866b4045767a56268ba673">
@@ -72,10 +76,6 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
-<!ENTITY make-upstream_fixes-patch "make-&make-version;-upstream_fixes-1.patch">
-<!ENTITY make-upstream_fixes-patch-md5 "8b1e478d8e733dc2d72e31bc7af1defa">
-<!ENTITY make-upstream_fixes-patch-size "5 KB">
-
 <!ENTITY man-db-upstream_fixes-patch "man-db-&man-db-version;-fix_man_assertion-1.patch">
 <!ENTITY man-db-upstream_fixes-patch-md5 "a2d7e211160564c13296476cb5f05574">
 <!ENTITY man-db-upstream_fixes-patch-size "3.9 KB">