Changeset 46e606f for chapter05/gawk-inst.xml

Timestamp:

05/01/2002 07:10:46 PM (22 years ago)

Author:

Gerard Beekmans <gerard@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.0, 6.1, 6.1.1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, v4_0, v4_1, v5_0, v5_1, v5_1_1, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

9ef08736

Parents:

689a79b

Message:

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

File:

• chapter05/gawk-inst.xml (modified) (2 diffs)

chapter05/gawk-inst.xml

@@ -12 +12 @@
 /usr/bin/*</userinput></para>
 
-<para>When installing Gawk 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>Install Gawk by running the following commands:</para>
 
 <para><screen><userinput>cp awklib/Makefile.in awklib/Makefile.in.backup &amp;&amp;
@@ -22 +18 @@
 -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;