gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-05 22:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

added man patch to replace sed, and added gcc-3.2-nofixincludes.patch

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2142 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Gerard Beekmans 2002-09-29 00:07:32 +00:00
parent 0d1de9459f
commit ab46b4e6a8
10 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
appendixa/man-down.xml
View File

@ -2,5 +2,9 @@
<title>Official Download Location</title>
<para><literallayout>Man (&man-version;):
<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"/></literallayout></para>
<ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"/>
Man Patch (&man-patch-version;):
<ulink url="&ftp;/"/>
<ulink url="&http;/"/></literallayout></para>
</sect2>

10
chapter01/changelog.xml
View File

@ -40,9 +40,11 @@
<listitem><para>fileutils-4.1.patch</para></listitem>
<listitem><para>gawk-3.1.1-2.patch</para></listitem>
<listitem><para>gcc-3.2.patch</para></listitem>
<listitem><para>gcc-3.2-nofixincludes.patch</para></listitem>
<listitem><para>glibc-2.2.5-2.patch</para></listitem>
<listitem><para>gzip-1.2.4b.patch</para></listitem>
<listitem><para>kbd-1.06-3.patch</para></listitem>
<listitem><para>man-1.5k.patch</para></listitem>
<listitem><para>ncurses-5.2.patch</para></listitem>
<listitem><para>procps-2.0.7.patch</para></listitem>
<listitem><para>sh-utils-2.0-hostname.patch</para></listitem>
@ -59,6 +61,14 @@
</itemizedlist>
</para></listitem>
<listitem><para>September 28th, 2002 [gerard]: Chapter 05 - GCC: Added the
nofixincludes patch to prevent that script from running in Chapter
05. It should run in Chapter 06, so we need it to be a seperate
patch.</para></listitem>
<listitem><para>September 28th, 2002 [gerard]: Chapter 06 - Man: Replaced
the sed contruction with a regular patch.</para></listitem>
<listitem><para>September 28th, 2002 [gerard]: Chapter 06 - Bzip2: Removed
the <emphasis>PREFIX=/usr</emphasis> from the
<userinput>make install</userinput> command because the

4
chapter04/gcc-patch.xml
View File

@ -1,3 +1,7 @@
GCC Patch (&gcc-patch-version;) - &gcc-patch-size;:
<ulink url="&ftp;/gcc-&gcc-patch-version;.patch.bz2"/>
<ulink url="&http;/gcc-&gcc-patch-version;.patch.bz2"/>
GCC nofixincludes Patch:
<ulink url="&ftp;/gcc-&gcc-version;-nofixincludes.patch.bz2"/>
<ulink url="&http;/gcc-&gcc-version;-nofixincludes.patch.bz2"/>

1
chapter04/packages.xml
View File

@ -45,6 +45,7 @@
&c3-make;
&c3-makedev;
&c3-man;
&c3-man-patch;
&c3-manpages;
&c3-modutils;
&c3-ncurses;

3
chapter05/gcc-exp.xml
View File

@ -6,6 +6,9 @@ This patch fixes a few bugs. In particular it contains the "copy fix" and
"var fix" documented at
<ulink url="http://www.zipworld.com.au/~gschafer/lfs-tweaks.html"/>.</para>
<para><userinput>patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch:</userinput>
This patch prevents the fixincludes script from running.</para>
<para><userinput>--prefix=/static:</userinput> This is NOT a typo. GCC hard
codes some paths while compiling and so we need to pass /static as the
prefix during ./configure. We pass the real install prefix during the

1
chapter05/gcc-inst.xml
View File

@ -15,6 +15,7 @@ been warned.</para>
<para>Install GCC by running the following commands:</para>
<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &amp;&amp;
patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch &amp;&amp;
mkdir ../gcc-build &amp;&amp;
cd ../gcc-build &amp;&amp;
../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \

10
chapter06/man-exp.xml
View File

@ -8,10 +8,12 @@ where a program is found. By appending /usr/bin:/bin to PATH for the
./configure command, we make sure that man doesn't use the /static versions
of our programs.</para>
<para><userinput>sed '/^PAGER/s/-is/-isR/'</userinput>:
The version of groff we installed supports SGR (Set Graphics Rendition)
escape sequences. In order for our man pages to display properly, we
add the R argument to the call for the less pager.</para>
<para><userinput>patch -Np1 -i ../man-&man-patch-version;.patch:</userinput>
This patch comments out one of the files in the <filename>man.conf</filename>
file (MANPATH /usr/man) because it will create redundant results when using
programs like <userinput>whatis</userinput>. It also adds the
<emphasis>-R</emphasis> option to the <emphasis>PAGER</emphasis> variable so
man pages are displayed properly.</para>
</sect2>

7
chapter06/man-inst.xml
View File

@ -3,13 +3,10 @@
<para>Run the following commands to install man:</para>
<para><screen><userinput>PATH=$PATH:/usr/bin:/bin \
<para><screen><userinput>patch -Np1 -i ../man-&man-patch-version;.patch &amp;&amp;
PATH=$PATH:/usr/bin:/bin \
&nbsp;&nbsp;&nbsp;&nbsp;./configure -default -confdir=/etc &amp;&amp;
make &amp;&amp;
cp src/man.conf{,.backup} &amp;&amp;
sed -e '/^PAGER/s/-is/-isR/' \
&nbsp;&nbsp;&nbsp;&nbsp;-e 's%MANPATH[[:space:]]/usr/man%#MANPATH /usr/man%' \
&nbsp;&nbsp;&nbsp;&nbsp;src/man.conf.backup > src/man.conf &amp;&amp;
make install</userinput></screen></para>
<para>Note: If you wish to disable SGR escape sequences, you should

3
entities/man.ent
View File

@ -1,4 +1,5 @@
<!ENTITY c3-man SYSTEM "../chapter03/man.xml">
<!ENTITY c3-man-patch SYSTEM "../chapter03/man-patch.xml">
<!ENTITY c6-man SYSTEM "../chapter06/man.xml">
<!ENTITY c6-man-inst SYSTEM "../chapter06/man-inst.xml">
@ -13,6 +14,8 @@
<!ENTITY man-depversion "1.5i2">
<!ENTITY man-contversion "1.5k">
<!ENTITY man-size "168 KB">
<!ENTITY man-patch-version "1.5k">
<!ENTITY man-patch-size "1 KB">
<!ENTITY man-dir "man-&man-version;">
<!ENTITY man-package "man-&man-version;.tar.bz2">

2
index.xml
View File

@ -15,7 +15,7 @@
<!ENTITY hints-index "http://hints.linuxfromscratch.org/hints.shtml">
<!ENTITY blfs-root "http://beyond.linuxfromscratch.org/">
<!ENTITY all-version "cvs-20020912-1602">
<!ENTITY all-version "cvs-20020928-1704">
<!ENTITY all-size-kb "105,560 KB">
<!ENTITY all-size-mb "103.88 MB">