Removed glibc-2.0 workarounds, removed export...unset constructs and replaced with var=varu ./configure constructs

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

appendixa/gzip-down.xml

@@ -2,10 +2,5 @@
 <title>Official Download Location</title>
 
 <para><literallayout>Gzip (&gzip-version;): 
-<ulink url="ftp://ftp.gnu.org/gnu/gzip/">ftp://ftp.gnu.org/gnu/gzip/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/gzip/">ftp://ftp.gnu.org/gnu/gzip/</ulink></literallayout></para>
-
-Gzip Patch (&gzip-version;):
-<ulink url="&ftp;/">&ftp;/</ulink>
-<ulink url="&http;/">&http;/</ulink></literallayout></para>
-
 </sect2>

appendixa/shellutils-down.xml

@@ -2,9 +2,5 @@
 <title>Official Download Location</title>
 
 <para><literallayout>Sh-utils (&sh-utils-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/sh-utils/">ftp://ftp.gnu.org/gnu/sh-utils/</ulink>
+<ulink url="ftp://ftp.gnu.org/gnu/sh-utils/">ftp://ftp.gnu.org/gnu/sh-utils/</ulink></literallayout></para>
-
-Sh-utils Patch (&sh-utils-version;):
-<ulink url="&ftp;/">&ftp;/</ulink>
-<ulink url="&http;/">&http;/</ulink></literallayout></para>
 </sect2>

chapter01/changelog.xml

@@ -18,6 +18,21 @@
 
 </para></listitem>
 
+<listitem><para>Removed:
+
+<itemizedlist>
+<listitem><para>gzip-1.2.4a-patch</para></listitem>
+<listitem><para>sh-utils-2.0-patch</para></listitem>
+</itemizedlist>
+
+</para></listitem>
+
+<listitem><para>May 1st, 2002 [gerard]: Removed all Glibc-2.0 workarounds -
+gzip patch, sh-utils patch, copying of libnss files. Also removed the
+<userinput>export VAR=VALUE...unset VAR</userinput> constructions and
+changed them to <userinput>VAR=VALUE ./configure</userinput>
+constructions.</para></listitem>
+
 <listitem><para>April 26th, 2002 [marcheerdink]: Chapter 06 Findutils: added
 libexecdir=/usr/bin to the make command to fix a wrong libexecdir path in
 updatedb.</para></listitem>

chapter04/gzip-patch.xml

@@ -1,4 +0,0 @@
-Gzip Patch (&gzip-version;) - &gzip-patch-size;:
-<ulink url="&ftp;/gzip-&gzip-version;.patch.bz2">&ftp;/gzip-&gzip-version;.patch.bz2</ulink>
-<ulink url="&http;/gzip-&gzip-version;.patch.bz2">&http;/gzip-&gzip-version;.patch.bz2</ulink>
-

chapter04/packages.xml

@@ -15,11 +15,9 @@
 &c3-kernel;
 &c3-grep;
 &c3-gzip;
-&c3-gzip-patch;
 &c3-make;
 &c3-sed;
 &c3-shellutils;
-&c3-shellutils-patch;
 &c3-tar;
 &c3-tar-patch;
 &c3-textutils;

chapter04/shellutils-patch.xml

@@ -1,4 +0,0 @@
-Sh-utils Patch (&sh-utils-version;) - &sh-utils-patch-size;:
-<ulink url="&ftp;/sh-utils-&sh-utils-version;.patch.bz2">&ftp;/sh-utils-&sh-utils-version;.patch.bz2</ulink>
-<ulink url="&http;/sh-utils-&sh-utils-version;.patch.bz2">&http;/sh-utils-&sh-utils-version;.patch.bz2</ulink>
-

chapter05/chapter05.xml

@@ -24,7 +24,6 @@
 &c5-texinfo;
 &c5-textutils;
 &c5-pwdgroup;
-&c5-oldnsslib;
 &c5-proc;
 
 </chapter>

chapter05/diffutils-inst.xml

@@ -1,22 +1,10 @@
 <sect2>
 <title>Installation of Diffutils</title>
 
-<para>When installing Diffutils using glibc-2.1.x on your base system, it may 
+<para>Install Diffutils by running the following commands:</para>
-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;
+<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
 ./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
-unset CPPFLAGS &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
-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 --disable-nls &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 

chapter05/gawk-inst.xml

@@ -11,30 +11,13 @@ class="directory">libexec</filename> directory to <filename
 class="directory">/usr/bin</filename> it'll run <userinput>rm -rf
 /usr/bin/*</userinput></para>
 
-<para>When installing Gawk using glibc-2.1.x on your base system,
+<para>Install Gawk by running the following commands:</para>
-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>cp awklib/Makefile.in awklib/Makefile.in.backup &amp;&amp;
-sed -e '/^datadir/s/awk/gawk/' \
--e '/^libexecdir/s%/awk%%' awklib/Makefile.in.backup \
-&nbsp;&nbsp;&nbsp;&gt; awklib/Makefile.in &amp;&amp;
-export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
-./configure --prefix=$LFS/usr --disable-nls \
-&nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin &amp;&amp;
-unset CPPFLAGS &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
-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 Gawk:</para>
 
 <para><screen><userinput>cp awklib/Makefile.in awklib/Makefile.in.backup &amp;&amp;
 sed -e '/^datadir/s/awk/gawk/' \
 -e '/^libexecdir/s%/awk%%' awklib/Makefile.in.backup \
 &nbsp;&nbsp;&nbsp;&gt; awklib/Makefile.in &amp;&amp;
+CPPFLAGS=-Dre_max_failures=re_max_failures2 \
 ./configure --prefix=$LFS/usr --disable-nls \
 &nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin &amp;&amp;
 make LDFLAGS=-static &amp;&amp;

chapter05/grep-inst.xml

@@ -1,24 +1,11 @@
 <sect2>
 <title>Installation of Grep</title>
 
-<para>When installing Grep using glibc-2.1.x on your base system,
+<para>Install Grep by running the following commands:</para>
-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;
+<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
 ./configure --prefix=$LFS/usr --bindir=$LFS/bin \
 &nbsp;&nbsp;&nbsp;--disable-nls --disable-perl-regexp &amp;&amp;
-unset CPPFLAGS &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
-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 Grep:</para>
-
-<para><screen><userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin \
-&nbsp;&nbsp;&nbsp;--disable-nls --disable-perl-regexp &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 

chapter05/gzip-inst.xml

@@ -1,17 +1,6 @@
 <sect2>
 <title>Installation of Gzip</title>
 
-<para>Before Gzip is installed, the patch file may need to be applied.  This 
-patch file is necessary to avoid a conflict of variable names
-with Glibc-2.0 systems when compiling and linking statically and so is
-only required if your base system runs Glibc-2.0.  It is however
-safe to apply the patch even if you are running a different glibc
-version, so if you aren't sure, it's best to apply it.</para>
-
-<para>Apply the patch by running the following command:</para>
-
-<para><screen><userinput>patch -Np1 -i ../gzip-&gzip-version;.patch</userinput></screen></para>
-
 <para>Install Gzip by running the following commands:</para>
 
 <para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;

chapter05/oldnsslib.xml

@@ -1,20 +0,0 @@
-<sect1 id="ch05-oldnsslib">
-<title>Copying old NSS library files</title>
-<?dbhtml filename="oldnsslib.html" dir="chapter05"?>
-
-<para>If your normal Linux system runs Glibc-2.0, you need to copy the NSS 
-library files to the LFS partition. Certain statically linked programs still 
-depend on the NSS library, especially programs that need to lookup 
-usernames, userid's and groupid's. You can check which C library version your 
-normal Linux system uses by simply executing the library, like this:</para>
-
-<para><screen><userinput>/lib/libc.so.6</userinput></screen></para>
-
-<para>The first line will give you the release version. Following lines contain
-interesting information. If you have Glibc-2.0.x installed on your starting
-distribution, copy the NSS library files by running:</para>
-
-<para><screen><userinput>cp -av /lib/libnss* $LFS/lib</userinput></screen></para>
-
-</sect1>
-

chapter05/patch-inst.xml

@@ -3,9 +3,8 @@
 
 <para>Install Patch by running the following commands:</para>
 
-<para><screen><userinput>export CPPFLAGS=-D_GNU_SOURCE &amp;&amp;
+<para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE \
 ./configure --prefix=$LFS/usr &amp;&amp;
-unset CPPFLAGS &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 

chapter05/sed-inst.xml

@@ -1,22 +1,10 @@
 <sect2>
 <title>Installation of Sed</title>
 
-<para>When installing Sed using glibc-2.1.x on your base system,
+<para>Install Sed by running the following commands:</para>
-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;
+<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
 ./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;
-unset CPPFLAGS &amp;&amp;
-make LDFLAGS=-static &amp;&amp;
-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 Sed:</para>
- 
-<para><screen><userinput>./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 

chapter05/shellutils-inst.xml

@@ -1,17 +1,6 @@
 <sect2>
 <title>Installation of Sh-utils</title>
 
-<para>Before Sh-utils is installed, the sh-utils patch file may need to
-be applied.  This patch is needed to avoid a conflict of variable names
-with certain Glibc versions (usually glibc-2.1.x) when compiling sh-utils 
-statically.  It is however safe to apply the patch even if you are
-running a different glibc version, so if you aren't sure, it's
-best to apply it.</para>
-
-<para>Apply the patch by running the following command:</para>
-
-<para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch</userinput></screen></para>
-
 <para>Install Sh-utils by running the following commands:</para>
 
 <para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;

chapter06/patch-inst.xml

@@ -3,9 +3,8 @@
 
 <para>Install Patch by running the following commands:</para>
 
-<para><screen><userinput>export CPPFLAGS=-D_GNU_SOURCE &amp;&amp;
+<para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE \
 ./configure --prefix=/usr &amp;&amp;
-unset CPPFLAGS &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
 

entities/chapter05.ent

@@ -4,5 +4,4 @@
 <!ENTITY c5-installasuser SYSTEM "../chapter05/installasuser.xml">
 <!ENTITY c5-creatingdirs SYSTEM "../chapter05/creatingdirs.xml">
 <!ENTITY c5-pwdgroup SYSTEM "../chapter05/pwdgroup.xml">
-<!ENTITY c5-oldnsslib SYSTEM "../chapter05/oldnsslib.xml">
 <!ENTITY c5-proc SYSTEM "../chapter05/proc.xml">

entities/gzip.ent

@@ -1,5 +1,4 @@
 <!ENTITY c3-gzip SYSTEM "../chapter03/gzip.xml">
-<!ENTITY c3-gzip-patch SYSTEM "../chapter03/gzip-patch.xml">
 
 <!ENTITY c5-gzip SYSTEM "../chapter05/gzip.xml">
 <!ENTITY c5-gzip-inst SYSTEM "../chapter05/gzip-inst.xml">
@@ -17,7 +16,6 @@
 <!ENTITY gzip-depversion "1.2.4a">
 <!ENTITY gzip-contversion "1.2.4a">
 <!ENTITY gzip-size "178 KB">
-<!ENTITY gzip-patch-size "1 KB">
 <!ENTITY gzip-package "gzip-&gzip-version;.tar.bz2">
 <!ENTITY gzip-dir "gzip-&gzip-version;">
 

entities/shellutils.ent

@@ -1,5 +1,4 @@
 <!ENTITY c3-shellutils SYSTEM "../chapter03/shellutils.xml">
-<!ENTITY c3-shellutils-patch SYSTEM "../chapter03/shellutils-patch.xml">
 
 <!ENTITY c5-shellutils SYSTEM "../chapter05/shellutils.xml">
 <!ENTITY c5-shellutils-inst SYSTEM "../chapter05/shellutils-inst.xml">
@@ -16,7 +15,6 @@
 <!ENTITY sh-utils-depversion "2.0">
 <!ENTITY sh-utils-contversion "2.0">
 <!ENTITY sh-utils-size "824 KB">
-<!ENTITY sh-utils-patch-size "1 KB">
 <!ENTITY sh-utils-package "sh-utils-&sh-utils-version;.tar.bz2">
 <!ENTITY sh-utils-dir "sh-utils-&sh-utils-version;">
 

index.xml

@@ -13,7 +13,7 @@
 <!ENTITY http "http://ftp.linuxfromscratch.org/lfs-packages/cvs">
 <!ENTITY hints-root "http://hints.linuxfromscratch.org/hints/">
 
-<!ENTITY all-version "cvs-20020421-0715">
+<!ENTITY all-version "cvs-20020501-1159">
 <!ENTITY all-size-kb "87,320 KB">
 <!ENTITY all-size-mb "85.27 MB">