From 37af5ac848fa702b390973d725d51eeac13ce563 Mon Sep 17 00:00:00 2001 From: Mark Hymers Date: Thu, 6 Sep 2001 15:44:47 +0000 Subject: [Bug 162] seperate patch commands in chap5 from main commands git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1187 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 4 ++++ chapter05/diffutils-inst.xml | 2 +- chapter05/grep-inst.xml | 13 ++++++++++++- chapter05/sed-inst.xml | 13 ++++++++++++- index.xml | 4 ++-- 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index ca895d1d3..6585a57e3 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -5,6 +5,10 @@ +September 6th, 2001 [markh]: Chapter 5 - Diffutils, Grep +and Sed: Moved the export CPPFLAGS fixes out of the main install +instructions and explained when they are necessary. + September 5th, 2001 [markh]: Chapter 5 - Gzip and Sh-utils: Moved the patches out of the main install instructions to a seperate section as we already do with the tar patch. Also removed diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml index f84a4321f..c10da0f8d 100644 --- a/chapter05/diffutils-inst.xml +++ b/chapter05/diffutils-inst.xml @@ -14,7 +14,7 @@ use the first version. make install If you are using a newer glibc version (2.2.x), you can use the following -commands to install diffutils: +commands to install Diffutils: ./configure --prefix=$LFS/usr && make LDFLAGS=-static && diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml index f6635c56c..945da319d 100644 --- a/chapter05/grep-inst.xml +++ b/chapter05/grep-inst.xml @@ -1,13 +1,24 @@ Installation of Grep -Install Grep by running the following commands: +When installing Grep using glibc-2.1.x on your base system, +it may be necessary to use a fix to prevent a variable name conflict. The +following commands can be used in this case. Note that these commands +can also be used for other glibc versions so if you aren't sure, then +use the first version. export CPPFLAGS=-Dre_max_failures=re_max_failures2 && ./configure --prefix=$LFS/usr --disable-nls && unset CPPFLAGS && make LDFLAGS=-static && make install + +If you are using a newer glibc version (2.2.x), you can use the +following commands to install Grep: + +./configure --prefix=$LFS/usr --disable-nls && +make LDFLAGS=-static && +make install diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml index 261fe36b0..82b4d4978 100644 --- a/chapter05/sed-inst.xml +++ b/chapter05/sed-inst.xml @@ -1,13 +1,24 @@ Installation of Sed -Install Sed by running the following commands: +When installing Sed using glibc-2.1.x on your base system, +it may be necessary to use a fix to prevent a variable name conflict. The +following commands can be used in this case. Note that these commands +can also be used for other glibc versions so if you aren't sure, then +use the first version. export CPPFLAGS=-Dre_max_failures=re_max_failures2 && ./configure --prefix=$LFS/usr --bindir=$LFS/bin && unset CPPFLAGS && make LDFLAGS=-static && make install + +If you are using a newer glibc version (2.2.x), you can use the +following commands to install Sed: + +./configure --prefix=$LFS/usr --bindir=$LFS/bin && +make LDFLAGS=-static && +make install diff --git a/index.xml b/index.xml index 8b4a55049..8d66cfc55 100644 --- a/index.xml +++ b/index.xml @@ -4,8 +4,8 @@ - - + + -- cgit v1.2.3-54-g00ecf