aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hymers <markh@linuxfromscratch.org>2001-09-06 15:31:32 +0000
committerMark Hymers <markh@linuxfromscratch.org>2001-09-06 15:31:32 +0000
commit7619a5a7177db622f73680048919cfffade7db8d (patch)
tree691b5b92fb7eaa5f252ea55742d0b5481f5744a8
parent1a71dc7d0bb4ef640e3b33dc69b09797f33167e2 (diff)
seperate out patch command
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1186 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter05/diffutils-inst.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml
index d2ce49a20..f84a4321f 100644
--- a/chapter05/diffutils-inst.xml
+++ b/chapter05/diffutils-inst.xml
@@ -1,7 +1,11 @@
<sect2>
<title>Installation of Diffutils</title>
-<para>Install Diffutils by running the following commands:</para>
+<para>When installing Diffutils 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.</para>
<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;</userinput>
<userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
@@ -9,5 +13,12 @@
<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
<userinput>make install</userinput></screen></para>
+<para>If you are using a newer glibc version (2.2.x), you can use the following
+commands to install diffutils:</para>
+
+<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
+<userinput>make LDFLAGS=-static &amp;&amp;</userinput>
+<userinput>make install</userinput></screen></para>
+
</sect2>