cvs commit: LFS/BOOK/entities chapter05.ent gzip.ent shellutils.ent

gerard at linuxfromscratch.org gerard at linuxfromscratch.org
Wed May 1 12:10:46 PDT 2002


gerard      02/05/01 12:10:46

  Modified:    BOOK     index.xml
               BOOK/appendixa gzip-down.xml shellutils-down.xml
               BOOK/chapter01 changelog.xml
               BOOK/chapter03 packages.xml
               BOOK/chapter05 chapter05.xml diffutils-inst.xml
                        gawk-inst.xml grep-inst.xml gzip-inst.xml
                        patch-inst.xml sed-inst.xml shellutils-inst.xml
               BOOK/chapter06 patch-inst.xml
               BOOK/entities chapter05.ent gzip.ent shellutils.ent
  Removed:     BOOK/chapter03 gzip-patch.xml shellutils-patch.xml
               BOOK/chapter05 oldnsslib.xml
  Log:
  Removed glibc-2.0 workarounds, removed export...unset constructs and replaced with var=varu ./configure constructs
  
  Revision  Changes    Path
  1.409     +1 -1      LFS/BOOK/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/index.xml,v
  retrieving revision 1.408
  retrieving revision 1.409
  diff -u -r1.408 -r1.409
  --- index.xml	1 May 2002 16:31:52 -0000	1.408
  +++ index.xml	1 May 2002 19:10:45 -0000	1.409
  @@ -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">
   
  
  
  
  1.2       +1 -6      LFS/BOOK/appendixa/gzip-down.xml
  
  Index: gzip-down.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/gzip-down.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gzip-down.xml	15 Dec 2001 14:28:34 -0000	1.1
  +++ gzip-down.xml	1 May 2002 19:10:45 -0000	1.2
  @@ -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>
  -
  -Gzip Patch (&gzip-version;):
  -<ulink url="&ftp;/">&ftp;/</ulink>
  -<ulink url="&http;/">&http;/</ulink></literallayout></para>
  -
  +<ulink url="ftp://ftp.gnu.org/gnu/gzip/">ftp://ftp.gnu.org/gnu/gzip/</ulink></literallayout></para>
   </sect2>
  
  
  
  1.2       +1 -5      LFS/BOOK/appendixa/shellutils-down.xml
  
  Index: shellutils-down.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/shellutils-down.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- shellutils-down.xml	15 Dec 2001 14:28:34 -0000	1.1
  +++ shellutils-down.xml	1 May 2002 19:10:45 -0000	1.2
  @@ -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>
  -
  -Sh-utils Patch (&sh-utils-version;):
  -<ulink url="&ftp;/">&ftp;/</ulink>
  -<ulink url="&http;/">&http;/</ulink></literallayout></para>
  +<ulink url="ftp://ftp.gnu.org/gnu/sh-utils/">ftp://ftp.gnu.org/gnu/sh-utils/</ulink></literallayout></para>
   </sect2>
  
  
  
  1.274     +15 -0     LFS/BOOK/chapter01/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/changelog.xml,v
  retrieving revision 1.273
  retrieving revision 1.274
  diff -u -r1.273 -r1.274
  --- changelog.xml	26 Apr 2002 12:11:11 -0000	1.273
  +++ changelog.xml	1 May 2002 19:10:45 -0000	1.274
  @@ -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>
  
  
  
  1.48      +0 -2      LFS/BOOK/chapter03/packages.xml
  
  Index: packages.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter03/packages.xml,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- packages.xml	9 Mar 2002 02:52:58 -0000	1.47
  +++ packages.xml	1 May 2002 19:10:45 -0000	1.48
  @@ -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;
  
  
  
  1.14      +0 -1      LFS/BOOK/chapter05/chapter05.xml
  
  Index: chapter05.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/chapter05.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- chapter05.xml	11 Mar 2002 04:13:35 -0000	1.13
  +++ chapter05.xml	1 May 2002 19:10:45 -0000	1.14
  @@ -24,7 +24,6 @@
   &c5-texinfo;
   &c5-textutils;
   &c5-pwdgroup;
  -&c5-oldnsslib;
   &c5-proc;
   
   </chapter>
  
  
  
  1.13      +2 -14     LFS/BOOK/chapter05/diffutils-inst.xml
  
  Index: diffutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/diffutils-inst.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- diffutils-inst.xml	4 Apr 2002 18:16:03 -0000	1.12
  +++ diffutils-inst.xml	1 May 2002 19:10:45 -0000	1.13
  @@ -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 
  -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 Diffutils by running the following commands:</para>
   
  -<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&
  +<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
   ./configure --prefix=$LFS/usr --disable-nls &&
  -unset CPPFLAGS &&
  -make LDFLAGS=-static &&
  -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 &&
   make LDFLAGS=-static &&
   make install</userinput></screen></para>
   
  
  
  
  1.8       +2 -19     LFS/BOOK/chapter05/gawk-inst.xml
  
  Index: gawk-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/gawk-inst.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- gawk-inst.xml	1 Apr 2002 14:42:18 -0000	1.7
  +++ gawk-inst.xml	1 May 2002 19:10:45 -0000	1.8
  @@ -11,30 +11,13 @@
   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,
  -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 &&
  -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</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>Install Gawk by running the following commands:</para>
   
   <para><screen><userinput>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 &&
  
  
  
  1.10      +2 -15     LFS/BOOK/chapter05/grep-inst.xml
  
  Index: grep-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/grep-inst.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- grep-inst.xml	9 Apr 2002 09:12:01 -0000	1.9
  +++ grep-inst.xml	1 May 2002 19:10:45 -0000	1.10
  @@ -1,23 +1,10 @@
   <sect2>
   <title>Installation of Grep</title>
   
  -<para>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.</para>
  +<para>Install Grep by running the following commands:</para>
   
  -<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&
  +<para><screen><userinput>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</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 \
      --disable-nls --disable-perl-regexp &&
   make LDFLAGS=-static &&
   make install</userinput></screen></para>
  
  
  
  1.16      +0 -11     LFS/BOOK/chapter05/gzip-inst.xml
  
  Index: gzip-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/gzip-inst.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- gzip-inst.xml	27 Oct 2001 22:21:44 -0000	1.15
  +++ gzip-inst.xml	1 May 2002 19:10:45 -0000	1.16
  @@ -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 &&
  
  
  
  1.8       +1 -2      LFS/BOOK/chapter05/patch-inst.xml
  
  Index: patch-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/patch-inst.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- patch-inst.xml	30 Jan 2002 20:11:21 -0000	1.7
  +++ patch-inst.xml	1 May 2002 19:10:45 -0000	1.8
  @@ -3,9 +3,8 @@
   
   <para>Install Patch by running the following commands:</para>
   
  -<para><screen><userinput>export CPPFLAGS=-D_GNU_SOURCE &&
  +<para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE \
   ./configure --prefix=$LFS/usr &&
  -unset CPPFLAGS &&
   make LDFLAGS=-static &&
   make install</userinput></screen></para>
   
  
  
  
  1.8       +2 -14     LFS/BOOK/chapter05/sed-inst.xml
  
  Index: sed-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/sed-inst.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- sed-inst.xml	27 Oct 2001 22:21:44 -0000	1.7
  +++ sed-inst.xml	1 May 2002 19:10:45 -0000	1.8
  @@ -1,22 +1,10 @@
   <sect2>
   <title>Installation of Sed</title>
   
  -<para>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.</para>
  +<para>Install Sed by running the following commands:</para>
   
  -<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &&
  +<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
   ./configure --prefix=$LFS/usr --bindir=$LFS/bin &&
  -unset CPPFLAGS &&
  -make LDFLAGS=-static &&
  -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 &&
   make LDFLAGS=-static &&
   make install</userinput></screen></para>
   
  
  
  
  1.22      +0 -11     LFS/BOOK/chapter05/shellutils-inst.xml
  
  Index: shellutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/shellutils-inst.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- shellutils-inst.xml	20 Feb 2002 01:10:39 -0000	1.21
  +++ shellutils-inst.xml	1 May 2002 19:10:45 -0000	1.22
  @@ -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 &&
  
  
  
  1.8       +1 -2      LFS/BOOK/chapter06/patch-inst.xml
  
  Index: patch-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter06/patch-inst.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- patch-inst.xml	30 Jan 2002 20:11:21 -0000	1.7
  +++ patch-inst.xml	1 May 2002 19:10:46 -0000	1.8
  @@ -3,9 +3,8 @@
   
   <para>Install Patch by running the following commands:</para>
   
  -<para><screen><userinput>export CPPFLAGS=-D_GNU_SOURCE &&
  +<para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE \
   ./configure --prefix=/usr &&
  -unset CPPFLAGS &&
   make &&
   make install</userinput></screen></para>
   
  
  
  
  1.3       +0 -1      LFS/BOOK/entities/chapter05.ent
  
  Index: chapter05.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/chapter05.ent,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- chapter05.ent	14 Apr 2002 05:56:10 -0000	1.2
  +++ chapter05.ent	1 May 2002 19:10:46 -0000	1.3
  @@ -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">
  
  
  
  1.2       +0 -2      LFS/BOOK/entities/gzip.ent
  
  Index: gzip.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/gzip.ent,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gzip.ent	12 Apr 2002 16:14:30 -0000	1.1
  +++ gzip.ent	1 May 2002 19:10:46 -0000	1.2
  @@ -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;">
   
  
  
  
  1.2       +0 -2      LFS/BOOK/entities/shellutils.ent
  
  Index: shellutils.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/shellutils.ent,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- shellutils.ent	12 Apr 2002 16:14:31 -0000	1.1
  +++ shellutils.ent	1 May 2002 19:10:46 -0000	1.2
  @@ -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;">
   
  
  
  
-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe lfs-book' in the subject header of the message



More information about the lfs-book mailing list