From 05e908edf81c58a6d0cc34aaab91b9f7898c324c Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Mon, 14 Oct 2013 19:25:15 +0000
Subject: Update to Make-4.0. Fixes #3410.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10359 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  4 ++++
 chapter01/whatsnew.xml  |  4 ++--
 chapter03/patches.xml   |  8 --------
 chapter05/glibc.xml     |  4 ++++
 chapter05/make.xml      | 15 ++++++++++++++-
 chapter06/glibc.xml     |  3 +++
 chapter06/make.xml      |  4 ----
 packages.ent            |  6 +++---
 patches.ent             |  4 ----
 9 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6ee8e13b4..b271bb1f5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,10 @@
     <listitem>
       <para>2013-10-14</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Update to Make 4.0. Fixes
+          <ulink url="&lfs-ticket-root;3410">#3410</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Update to Tar 1.27. Fixes
           <ulink url="&lfs-ticket-root;3409">#3409</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index dba96b8c8..ac7de5585 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -136,9 +136,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>-->
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 401fa8776..69abd9853 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -58,14 +58,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Make Upstream Fixes Patch - <token>&make-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&make-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&make-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 3eaf21932..9ae8be8cd 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -56,6 +56,10 @@ fi</userinput></screen>
 
 <screen><userinput remap="pre">sed -i -e 's/static __m128i/inline &amp;/' sysdeps/x86_64/multiarch/strstr.c</userinput></screen>
 
+    <para>Allow Glibc to be built using Make-&make-version;:</para>
+
+<screen><userinput remap="pre">sed -r -i 's/(3..89..)/\1 | 4.*/' configure</userinput></screen>
+
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
 
diff --git a/chapter05/make.xml b/chapter05/make.xml
index 44cbac46c..22b5afb4e 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -44,7 +44,20 @@
 
     <para>Prepare Make for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools --without-guile</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the configure option:</title>
+
+      <varlistentry>
+        <term><parameter>--without-guile</parameter></term>
+        <listitem>
+          <para>This ensures that Make-&make-version; won't link against Guile libraries, which
+          may be present on the host system, but won't be available within the
+          <command>chroot</command> environment in the next chapter.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
     <para>Compile the package:</para>
 
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 45102933e..e5f4503ef 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -65,6 +65,9 @@
 
 <screen><userinput remap="pre">sed -i -e 's/static __m128i/inline &amp;/' sysdeps/x86_64/multiarch/strstr.c</userinput></screen>
 
+    <para>Allow Glibc to be built with Make-&make-version;:</para>
+
+<screen><userinput remap="pre">sed -r -i 's/(3..89..)/\1 | 4.*/' configure</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 2faaa177a..791908683 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -40,10 +40,6 @@
   <sect2 role="installation">
     <title>Installation of Make</title>
 
-    <para>First apply some upstream patches:</para>
-
-<screen><userinput remap="configure">patch -Np1 -i ../&make-fixes-patch;</userinput></screen>
-
     <para>Prepare Make for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 44f1ef148..164a22db5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -367,10 +367,10 @@
 <!ENTITY m4-ch6-du "30 MB">
 <!ENTITY m4-ch6-sbu "0.4 SBU">
 
-<!ENTITY make-version "3.82">
-<!ENTITY make-size "1,213 KB">
+<!ENTITY make-version "4.0">
+<!ENTITY make-size "1,311 KB">
 <!ENTITY make-url "&gnu;make/make-&make-version;.tar.bz2">
-<!ENTITY make-md5 "1a11100f3c63fcf5753818e59d63088f">
+<!ENTITY make-md5 "571d470a7647b455e3af3f92d79f1c18">
 <!ENTITY make-home "&gnu-software;make/">
 <!ENTITY make-ch5-du "11.2 MB">
 <!ENTITY make-ch5-sbu "0.1 SBU">
diff --git a/patches.ent b/patches.ent
index e6003f7e8..4d9245105 100644
--- a/patches.ent
+++ b/patches.ent
@@ -22,10 +22,6 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
-<!ENTITY make-fixes-patch "make-&make-version;-upstream_fixes-3.patch">
-<!ENTITY make-fixes-patch-md5 "95027ab5b53d01699845d9b7e1dc878d">
-<!ENTITY make-fixes-patch-size "10 KB">
-
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
 <!ENTITY perl-libc-patch-md5 "daf5c64fd7311e924966842680535f8f">
 <!ENTITY perl-libc-patch-size "1.6 KB">
-- 
cgit v1.2.3-54-g00ecf