Removed reiserfsprogs. Updated file and util-linux. Many miscellaneous changes.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2038 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

11 files changed, 21 insertions, 15 deletions

diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml
index f5f59fd15..1d83c6337 100644
--- a/chapter05/diffutils-inst.xml
+++ b/chapter05/diffutils-inst.xml
@@ -3,9 +3,9 @@
 
 <para>Install Diffutils by running the following commands:</para>
 
-<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/static --disable-nls &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
+<para><screen><userinput>LDFLAGS=-static CPPFLAGS=-Dre_max_failures=re_max_failures2 \
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static --disable-nls &amp;&amp;
+make &amp;&amp;
 make install</userinput></screen></para>
 
 </sect2>
diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml
index 89deed1f9..8e209b4e1 100644
--- a/chapter05/fileutils-inst.xml
+++ b/chapter05/fileutils-inst.xml
@@ -25,8 +25,9 @@ than likely result in all kinds of compile time problems.</para>
 
 <para>Install Fileutils by running the following commands:</para>
 
-<para><screen><userinput>./configure --disable-nls --prefix=$LFS/static &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
+<para><screen><userinput>LDFLAGS=-static \
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --disable-nls --prefix=$LFS/static &amp;&amp;
+make &amp;&amp;
 make install</userinput></screen></para>
 
 <para>Once you have installed Fileutils, you can test whether the
diff --git a/chapter05/findutils-inst.xml b/chapter05/findutils-inst.xml
index 2247dedf1..6fd3b61a2 100644
--- a/chapter05/findutils-inst.xml
+++ b/chapter05/findutils-inst.xml
@@ -9,7 +9,7 @@ commands.</para>
 
 <para><screen><userinput>patch -Np1 -i ../findutils-&findutils-patch-version;.patch &amp;&amp;
 CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/static &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml
index e5f97ae6d..0ca0902ba 100644
--- a/chapter05/gawk-inst.xml
+++ b/chapter05/gawk-inst.xml
@@ -5,7 +5,7 @@
 running the following commands:</para>
 
 <para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/static --disable-nls &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static --disable-nls &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml
index b298990df..254e713ff 100644
--- a/chapter05/gcc-exp.xml
+++ b/chapter05/gcc-exp.xml
@@ -18,6 +18,10 @@ the --enable-languages parameter may be omitted.</para>
 <para><userinput>--enable-threads=posix:</userinput> This enables C++ 
 exception handling for multithreaded code.</para>
 
+<para><userinput>echo "#define HAVE_GAS_HIDDEN 1":</userinput>
+This defines the .hidden assembler directive so that we don't build
+a faulty Glibc later on.</para>
+
 <para><userinput>ln -s gcc $LFS/static/bin/cc:</userinput> This
 creates the $LFS/static/bin/gcc symlink which some packages need.</para>
 
diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml
index 13f283098..c0a9c97ef 100644
--- a/chapter05/gcc-inst.xml
+++ b/chapter05/gcc-inst.xml
@@ -14,6 +14,7 @@ been warned.</para>
 cd ../gcc-build &amp;&amp;
 ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \
 &nbsp;&nbsp;&nbsp;--disable-nls --disable-shared --enable-threads=posix &amp;&amp;
+echo "#define HAVE_GAS_HIDDEN 1" >> gcc/auto-host.h &amp;&amp;
 make BOOT_LDFLAGS=-static bootstrap &amp;&amp;
 make prefix=$LFS/static install &amp;&amp;
 ln -s gcc $LFS/static/bin/cc</userinput></screen></para>
diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml
index 18fe41068..164b0f73f 100644
--- a/chapter05/grep-inst.xml
+++ b/chapter05/grep-inst.xml
@@ -3,10 +3,10 @@
 
 <para>Install Grep by running the following commands:</para>
 
-<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/static --disable-nls \
+<para><screen><userinput>LDFLAGS=-static CPPFLAGS=-Dre_max_failures=re_max_failures2 \
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static --disable-nls \
 &nbsp;&nbsp;&nbsp;&nbsp;--disable-perl-regexp &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
+make &amp;&amp;
 make install</userinput></screen></para>
 
 </sect2>
diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml
index 4528b7f2b..6017a3593 100644
--- a/chapter05/patch-inst.xml
+++ b/chapter05/patch-inst.xml
@@ -4,7 +4,7 @@
 <para>Install Patch by running the following commands:</para>
 
 <para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE \
-./configure --prefix=$LFS/static &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml
index 1f30b36e8..775bd86fe 100644
--- a/chapter05/sed-inst.xml
+++ b/chapter05/sed-inst.xml
@@ -4,7 +4,7 @@
 <para>Install Sed by running the following commands:</para>
 
 <para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/static &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=$LFS/static &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml
index 0e36b6b96..7e4c29bff 100644
--- a/chapter05/texinfo-inst.xml
+++ b/chapter05/texinfo-inst.xml
@@ -3,9 +3,9 @@
 
 <para>Install Texinfo by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/static \
+<para><screen><userinput>LDFLAGS=-static ./configure --prefix=$LFS/static \
 &nbsp;&nbsp;&nbsp;&nbsp;--disable-nls &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
+make &amp;&amp;
 make install</userinput></screen></para>
 
 </sect2>
diff --git a/chapter05/whystatic.xml b/chapter05/whystatic.xml
index e00b2f8d4..cdcab4d1a 100644
--- a/chapter05/whystatic.xml
+++ b/chapter05/whystatic.xml
@@ -19,7 +19,7 @@ has.</para>
 can often be around 2.5 MB), so you may not want a separate copy of each
 library attached to the program. Just imagine if you had a simple command
 like ls with an extra 2.5 MB attached to it! Instead of making the library
-an actual part of the program, or statically linked, the library is kept a
+an actual part of the program, or statically linked, the library is stored as a
 separate file, which is loaded only when the program needs it. This is what
 we call dynamically linked, as the library is loaded and unloaded dynamically,
 as the program needs it.</para>