More from Zack: Ncurses symlinks fixes, procps removal of XSCPT=, --without-debug for ncurses.

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

README

@@ -9,7 +9,7 @@ XML to HTML:
 Create a directory in which you want to store the HTML files and cd into 
 that directory. Now run:
 
-	mkdir -p chapter0{1,2,3,4,5,6,7,8,9} preface appendix{a,b} &&
+	mkdir -p chapter0{1,2,3,4,5,6,7,8,9} preface appendixa &&
 	/usr/bin/openjade -t xml \
 		-d /usr/share/dsssl/docbook/html/lfs.dsl \
 		/usr/share/dsssl/docbook/dtds/decls/xml.dcl \

chapter01/changelog.xml

@@ -68,6 +68,18 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Installing Ncurses:
+Fix up the symlinks so that they follow suit of other library symlinks.
+No more weirdness here.</para></listitem>
+
+<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Installing Procps:
+Removed XSCPT="" cruft and it's corresponding paragraph. This stuff
+isn't needed anymore.</para></listitem>
+
+<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Installing Ncurses:
+Pass --without-debug to the configure script. It seems to have gotten
+lost at some point.</para></listitem>
+
 <listitem><para>May 11th, 2003 [timothy]: Chapter 5 &amp; 6 - Installing
 Bzip2, Installing Zlib: Modified build commands per bug #524.</para></listitem>
 

chapter04/coreutils-patch.xml

@@ -1,3 +1,7 @@
-Coreutils Patch (&coreutils-patch-version;) - &coreutils-patch-size;:
-<ulink url="&ftp;/coreutils-&coreutils-patch-version;.patch"/>
-<ulink url="&http;/coreutils-&coreutils-patch-version;.patch"/>
+Coreutils Uname Patch (&coreutils-uname-patch-version;) - &coreutils-uname-patch-size;:
+<ulink url="&ftp;/coreutils-&coreutils-uname-patch-version;.patch"/>
+<ulink url="&http;/coreutils-&coreutils-uname-patch-version;.patch"/>
+
+Coreutils Hostname Patch (&coreutils-hostname-patch-version;) - &coreutils-hostname-patch-size;:
+<ulink url="&ftp;/coreutils-&coreutils-hostname-patch-version;.patch"/>
+<ulink url="&http;/coreutils-&coreutils-hostname-patch-version;.patch"/>

chapter04/gcc-patch.xml

@@ -0,0 +1,8 @@
+GCC Specs Patch:
+<ulink url="&http;/gcc-3.2.3-specs-3.patch"/>
+
+GCC MMap Test Patch:
+<ulink url="&http;/gcc-3.2.3-mmap_test.patch"/>
+
+GCC No Fixincludes Patch:
+<ulink url="&http;/gcc-3.2.3-no_fixincludes.patch"/>

chapter04/gcc.xml

@@ -1,11 +1,2 @@
 GCC (&gcc-version;) - &gcc-core-size;:
 <ulink url="http://freshmeat.net/projects/gcc/"/>
-
-GCC Specs Patch:
-<ulink url="&http;/gcc-3.2.3-specs-3.patch"/>
-
-GCC MMap Test Patch:
-<ulink url="&http;/gcc-3.2.3-mmap_test.patch"/>
-
-GCC No Fixincludes Patch:
-<ulink url="&http;/gcc-3.2.3-no_fixincludes.patch"/>

chapter04/packages.xml

@@ -29,6 +29,7 @@
 &c4-gawk;
 &c4-gawk-patch;
 &c4-gcc;
+&c4-gcc-patch;
 &c4-gcc-2953;
 &c4-gettext;
 &c4-glibc;

chapter06/coreutils-inst.xml

@@ -4,9 +4,16 @@
 <title>Installation of Coreutils</title>
 
 <para>Normally the functionality of uname is somewhat broken, in that
-the -p switch always returns "unknown". This patch fixes that behaviour:</para>
+the -p switch always returns "unknown". This patch fixes that behaviour
+for Intel architectures:</para>
 
-<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-uname-patch-version;.patch</userinput></screen></para>
+
+<para>We do not want Coreutils to install it's version of the hostname
+binary, because it is inferior to the version provided by Net-tools.
+Prevent the installation of hostname with this patch:</para>
+
+<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-hostname-patch-version;.patch</userinput></screen></para>
 
 <para>Prepare Coreutils to be compiled:</para>
 

chapter06/ncurses-inst.xml

@@ -7,7 +7,8 @@
 
 <para>Prepare Ncurses to be compiled:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --with-shared</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --with-shared &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;--without-debug</userinput></screen></para>
 
 <para>Continue with compiling the package:</para>
 
@@ -30,8 +31,7 @@ where they're expected to reside:</para>
 <filename>/lib</filename>, a few symlinks are currently pointing
 towards non-existing files. Recreate those symlinks:</para>
 
-<para><screen><userinput>ln -sf libncurses.a /usr/lib/libcurses.a &amp;&amp;
-ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so &amp;&amp;
-ln -sf ../../lib/libncurses.so.5 /usr/lib/libcurses.so</userinput></screen></para>
+<para><screen><userinput>ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so &amp;&amp;
+ln -sf libncurses.so /usr/lib/libcurses.so</userinput></screen></para>
 </sect2>
 

chapter06/procps-inst.xml

@@ -16,13 +16,7 @@ the patch:</para>
 
 <para>Finish installing the package:</para>
 
-<para><screen><userinput>make XSCPT="" install</userinput></screen></para>
-
-<para>The <emphasis>XSCPT</emphasis> option will set the Makefile
-variable XSCPT to an empty value so that XConsole installation is
-disabled. Otherwise, <userinput>make install</userinput> tries to
-copy the file XConsole to /usr/X11R6/lib/X11/app-defaults. That
-directory does not exist because X is not installed.</para>
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
 

entities/coreutils.ent

@@ -19,8 +19,10 @@
 <!ENTITY coreutils-size "1,831 KB">
 <!ENTITY coreutils-dir "coreutils-&coreutils-version;">
 <!ENTITY coreutils-package "coreutils-&coreutils-version;.tar.bz2">
-<!ENTITY coreutils-patch-size "1 KB">
-<!ENTITY coreutils-patch-version "5.0-uname">
+<!ENTITY coreutils-uname-patch-size "1 KB">
+<!ENTITY coreutils-uname-patch-version "5.0-uname">
+<!ENTITY coreutils-hostname-patch-size "1 KB">
+<!ENTITY coreutils-hostname-patch-version "5.0-hostname">
 
 <!ENTITY coreutils-compsize-static "17 MB">
 <!ENTITY coreutils-time-static "0.39 SBU">