Author: matthew
Date: Mon Oct 14 12:25:15 2013
New Revision: 10359
Log:
Update to Make-4.0. Fixes #3410.
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter01/whatsnew.xml
trunk/BOOK/chapter03/patches.xml
trunk/BOOK/chapter05/glibc.xml
trunk/BOOK/chapter05/make.xml
trunk/BOOK/chapter06/glibc.xml
trunk/BOOK/chapter06/make.xml
trunk/BOOK/packages.ent
trunk/BOOK/patches.ent
Modified: trunk/BOOK/chapter01/changelog.xml
==============================================================================
--- trunk/BOOK/chapter01/changelog.xml Mon Oct 14 12:23:36 2013 (r10358)
+++ trunk/BOOK/chapter01/changelog.xml Mon Oct 14 12:25:15 2013 (r10359)
@@ -39,6 +39,10 @@
<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>
</listitem>
Modified: trunk/BOOK/chapter01/whatsnew.xml
==============================================================================
--- trunk/BOOK/chapter01/whatsnew.xml Mon Oct 14 12:23:36 2013 (r10358)
+++ trunk/BOOK/chapter01/whatsnew.xml Mon Oct 14 12:25:15 2013 (r10359)
@@ -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>-->
Modified: trunk/BOOK/chapter03/patches.xml
==============================================================================
--- trunk/BOOK/chapter03/patches.xml Mon Oct 14 12:23:36 2013 (r10358)
+++ trunk/BOOK/chapter03/patches.xml Mon Oct 14 12:25:15 2013 (r10359)
@@ -59,14 +59,6 @@
</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>
<para>Download: <ulink url="&patches-root;&perl-libc-patch;"/></para>
Modified: trunk/BOOK/chapter05/glibc.xml
==============================================================================
--- trunk/BOOK/chapter05/glibc.xml Mon Oct 14 12:23:36 2013 (r10358)
+++ trunk/BOOK/chapter05/glibc.xml Mon Oct 14 12:25:15 2013 (r10359)
@@ -56,6 +56,10 @@
<screen><userinput remap="pre">sed -i -e 's/static __m128i/inline &/'
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>
Modified: trunk/BOOK/chapter05/make.xml
==============================================================================
--- trunk/BOOK/chapter05/make.xml Mon Oct 14 12:23:36 2013 (r10358)
+++ trunk/BOOK/chapter05/make.xml Mon Oct 14 12:25:15 2013 (r10359)
@@ -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>
Modified: trunk/BOOK/chapter06/glibc.xml
==============================================================================
--- trunk/BOOK/chapter06/glibc.xml Mon Oct 14 12:23:36 2013 (r10358)
+++ trunk/BOOK/chapter06/glibc.xml Mon Oct 14 12:25:15 2013 (r10359)
@@ -65,6 +65,9 @@
<screen><userinput remap="pre">sed -i -e 's/static __m128i/inline &/'
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>
Modified: trunk/BOOK/chapter06/make.xml
==============================================================================
--- trunk/BOOK/chapter06/make.xml Mon Oct 14 12:23:36 2013 (r10358)
+++ trunk/BOOK/chapter06/make.xml Mon Oct 14 12:25:15 2013 (r10359)
@@ -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>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Mon Oct 14 12:23:36 2013 (r10358)
+++ trunk/BOOK/packages.ent Mon Oct 14 12:25:15 2013 (r10359)
@@ -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">
Modified: trunk/BOOK/patches.ent
==============================================================================
--- trunk/BOOK/patches.ent Mon Oct 14 12:23:36 2013 (r10358)
+++ trunk/BOOK/patches.ent Mon Oct 14 12:25:15 2013 (r10359)
@@ -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">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
