From 46e606f94025ac21e748e025b921ff4704008535 Mon Sep 17 00:00:00 2001 From: Gerard Beekmans Date: Wed, 1 May 2002 19:10:46 +0000 Subject: 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 --- chapter05/chapter05.xml | 1 - chapter05/diffutils-inst.xml | 16 ++-------------- chapter05/gawk-inst.xml | 21 ++------------------- chapter05/grep-inst.xml | 17 ++--------------- chapter05/gzip-inst.xml | 11 ----------- chapter05/oldnsslib.xml | 20 -------------------- chapter05/patch-inst.xml | 3 +-- chapter05/sed-inst.xml | 16 ++-------------- chapter05/shellutils-inst.xml | 11 ----------- 9 files changed, 9 insertions(+), 107 deletions(-) delete mode 100644 chapter05/oldnsslib.xml (limited to 'chapter05') diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index 406678adf..efe68d07a 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -24,7 +24,6 @@ &c5-texinfo; &c5-textutils; &c5-pwdgroup; -&c5-oldnsslib; &c5-proc; diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml index c606e0db9..a4af5074d 100644 --- a/chapter05/diffutils-inst.xml +++ b/chapter05/diffutils-inst.xml @@ -1,22 +1,10 @@ Installation of Diffutils -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. +Install Diffutils by running the following commands: -export CPPFLAGS=-Dre_max_failures=re_max_failures2 && +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 Diffutils: - -./configure --prefix=$LFS/usr --disable-nls && make LDFLAGS=-static && make install diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml index 7d10b61cd..81c923fb3 100644 --- a/chapter05/gawk-inst.xml +++ b/chapter05/gawk-inst.xml @@ -11,30 +11,13 @@ class="directory">libexec directory to /usr/bin it'll run rm -rf /usr/bin/* -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. - -cp awklib/Makefile.in awklib/Makefile.in.backup && -sed -e '/^datadir/s/awk/gawk/' \ --e '/^libexecdir/s%/awk%%' awklib/Makefile.in.backup \ -   > awklib/Makefile.in && -export CPPFLAGS=-Dre_max_failures=re_max_failures2 && -./configure --prefix=$LFS/usr --disable-nls \ -   --libexecdir=$LFS/usr/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 Gawk: +Install Gawk by running the following commands: cp awklib/Makefile.in awklib/Makefile.in.backup && sed -e '/^datadir/s/awk/gawk/' \ -e '/^libexecdir/s%/awk%%' awklib/Makefile.in.backup \    > awklib/Makefile.in && +CPPFLAGS=-Dre_max_failures=re_max_failures2 \ ./configure --prefix=$LFS/usr --disable-nls \    --libexecdir=$LFS/usr/bin && make LDFLAGS=-static && diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml index 62244f357..305775029 100644 --- a/chapter05/grep-inst.xml +++ b/chapter05/grep-inst.xml @@ -1,24 +1,11 @@ Installation of Grep -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. +Install Grep by running the following commands: -export CPPFLAGS=-Dre_max_failures=re_max_failures2 && +CPPFLAGS=-Dre_max_failures=re_max_failures2 \ ./configure --prefix=$LFS/usr --bindir=$LFS/bin \    --disable-nls --disable-perl-regexp && -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 --bindir=$LFS/bin \ -   --disable-nls --disable-perl-regexp && make LDFLAGS=-static && make install diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml index d12031710..912af3ba3 100644 --- a/chapter05/gzip-inst.xml +++ b/chapter05/gzip-inst.xml @@ -1,17 +1,6 @@ Installation of Gzip -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. - -Apply the patch by running the following command: - -patch -Np1 -i ../gzip-&gzip-version;.patch - Install Gzip by running the following commands: ./configure --prefix=$LFS/usr && diff --git a/chapter05/oldnsslib.xml b/chapter05/oldnsslib.xml deleted file mode 100644 index 7fb17146b..000000000 --- a/chapter05/oldnsslib.xml +++ /dev/null @@ -1,20 +0,0 @@ - -Copying old NSS library files - - -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: - -/lib/libc.so.6 - -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: - -cp -av /lib/libnss* $LFS/lib - - - diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml index 215ad9723..89512820a 100644 --- a/chapter05/patch-inst.xml +++ b/chapter05/patch-inst.xml @@ -3,9 +3,8 @@ Install Patch by running the following commands: -export CPPFLAGS=-D_GNU_SOURCE && +CPPFLAGS=-D_GNU_SOURCE \ ./configure --prefix=$LFS/usr && -unset CPPFLAGS && make LDFLAGS=-static && make install diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml index 377fd3d6a..38ed00dc7 100644 --- a/chapter05/sed-inst.xml +++ b/chapter05/sed-inst.xml @@ -1,22 +1,10 @@ Installation of Sed -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. +Install Sed by running the following commands: -export CPPFLAGS=-Dre_max_failures=re_max_failures2 && +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/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml index 624964af8..74602382a 100644 --- a/chapter05/shellutils-inst.xml +++ b/chapter05/shellutils-inst.xml @@ -1,17 +1,6 @@ Installation of Sh-utils -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. - -Apply the patch by running the following command: - -patch -Np1 -i ../sh-utils-&sh-utils-version;.patch - Install Sh-utils by running the following commands: ./configure --prefix=$LFS/usr --disable-nls && -- cgit v1.2.3-54-g00ecf