aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2013-10-14 19:25:15 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2013-10-14 19:25:15 +0000
commit05e908edf81c58a6d0cc34aaab91b9f7898c324c (patch)
tree3857210494bdcacca29bef04cafad734ca094ec3 /chapter06
parent2971a56b0da022dd32912010f83b178ed029ab7f (diff)
Update to Make-4.0. Fixes #3410.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10359 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/glibc.xml3
-rw-r--r--chapter06/make.xml4
2 files changed, 3 insertions, 4 deletions
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>