From 05e908edf81c58a6d0cc34aaab91b9f7898c324c Mon Sep 17 00:00:00 2001 From: Matthew Burgess 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 --- chapter05/glibc.xml | 4 ++++ chapter05/make.xml | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'chapter05') 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 sed -i -e 's/static __m128i/inline &/' sysdeps/x86_64/multiarch/strstr.c + Allow Glibc to be built using Make-&make-version;: + +sed -r -i 's/(3..89..)/\1 | 4.*/' configure + The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory: 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 @@ Prepare Make for compilation: -./configure --prefix=/tools +./configure --prefix=/tools --without-guile + + + The meaning of the configure option: + + + --without-guile + + 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 + chroot environment in the next chapter. + + + Compile the package: -- cgit v1.2.3-54-g00ecf