r1611 - in trunk/BOOK: boot/common chroot/common final-system/common final-system/multilib introduction/common

chris at linuxfromscratch.org chris at linuxfromscratch.org
Mon May 15 23:56:51 PDT 2006


Author: chris
Date: 2006-05-16 00:56:47 -0600 (Tue, 16 May 2006)
New Revision: 1611

Modified:
   trunk/BOOK/boot/common/createfiles.xml
   trunk/BOOK/chroot/common/createfiles.xml
   trunk/BOOK/final-system/common/automake.xml
   trunk/BOOK/final-system/common/perl.xml
   trunk/BOOK/final-system/multilib/perl-64bit.xml
   trunk/BOOK/introduction/common/changelog.xml
Log:
Updated package build instructions as needed for the modified build order

Modified: trunk/BOOK/boot/common/createfiles.xml
===================================================================
--- trunk/BOOK/boot/common/createfiles.xml	2006-05-16 06:48:18 UTC (rev 1610)
+++ trunk/BOOK/boot/common/createfiles.xml	2006-05-16 06:56:47 UTC (rev 1611)
@@ -15,7 +15,7 @@
   links which will be replaced by real files throughout the course of
   the next chapter after the software has been installed.</para>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${LFS}/bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,grep,pwd,stty} ${LFS}/bin
 ln -sv /tools/lib/libgcc_s.so{,.1} ${LFS}/usr/lib
 ln -sv bash ${LFS}/bin/sh</userinput></screen>
 

Modified: trunk/BOOK/chroot/common/createfiles.xml
===================================================================
--- trunk/BOOK/chroot/common/createfiles.xml	2006-05-16 06:48:18 UTC (rev 1610)
+++ trunk/BOOK/chroot/common/createfiles.xml	2006-05-16 06:56:47 UTC (rev 1611)
@@ -14,7 +14,7 @@
   href="../../boot/common/createfiles.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} /bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,grep,pwd,stty} /bin
 ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
 ln -sv bash /bin/sh</userinput></screen>
 

Modified: trunk/BOOK/final-system/common/automake.xml
===================================================================
--- trunk/BOOK/final-system/common/automake.xml	2006-05-16 06:48:18 UTC (rev 1610)
+++ trunk/BOOK/final-system/common/automake.xml	2006-05-16 06:56:47 UTC (rev 1611)
@@ -34,7 +34,9 @@
 <screen os="d"><userinput>make</userinput></screen>
 
     <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <userinput>make check</userinput>. 2 tests are skipped that use
+    Automake.  For full test coverage, Autoconf can be re-tested after
+    Automake has been installed.</para>
 
     <para os="f">Install the package:</para>
 

Modified: trunk/BOOK/final-system/common/perl.xml
===================================================================
--- trunk/BOOK/final-system/common/perl.xml	2006-05-16 06:48:18 UTC (rev 1610)
+++ trunk/BOOK/final-system/common/perl.xml	2006-05-16 06:56:47 UTC (rev 1611)
@@ -37,7 +37,10 @@
     this package is built. If the defaults it auto-detects are suitable,
     prepare Perl for compilation with:</para>
 
-<screen os="b"><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR"</userinput></screen>
+<screen os="b"><userinput>./configure.gnu --prefix=/usr \
+   -Dman1dir=/usr/share/man/man1 \
+   -Dman3dir=/usr/share/man/man3 \
+   -Dpager="/bin/less -isR"</userinput></screen>
 
     <variablelist os="c">
       <title>The meaning of the configure option:</title>
@@ -49,6 +52,14 @@
           invokes the <command>less</command> program.</para>
         </listitem>
       </varlistentry>
+      <varlistentry os="c2">
+        <term><parameter>-Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3</parameter></term>
+        <listitem>
+          <para>Since Groff is not installed yet,
+          <command>configure.gnu</command> thinks that we do not want
+          man pages for Perl. Issuing these parameters overrides this decision.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
     <para os="d">Compile the package:</para>

Modified: trunk/BOOK/final-system/multilib/perl-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/perl-64bit.xml	2006-05-16 06:48:18 UTC (rev 1610)
+++ trunk/BOOK/final-system/multilib/perl-64bit.xml	2006-05-16 06:56:47 UTC (rev 1611)
@@ -58,7 +58,10 @@
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" \
+<screen os="b"><userinput>./configure.gnu --prefix=/usr \
+   -Dman1dir=/usr/share/man/man1 \
+   -Dman3dir=/usr/share/man/man3 \
+   -Dpager="/bin/less -isR" \
    -Dlibpth="/usr/local/lib64 /lib64 /usr/lib64" \
    -Dcc="gcc ${BUILD64}"</userinput></screen>
 
@@ -76,6 +79,10 @@
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='c1'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='c2'])"/>
+
     </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-05-16 06:48:18 UTC (rev 1610)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-05-16 06:56:47 UTC (rev 1611)
@@ -40,8 +40,9 @@
       <para>May 16, 2006</para>
       <itemizedlist>
         <listitem>
-          <para>[Chris] - Changed the temp-system package build order
-          (another part of ticket #26).</para>
+          <para>[Chris] - Changed the temp-system and final-system
+          package build order and a few package build instructions to
+          account for the changed order (the rest of ticket #26).</para>
         </listitem>
       </itemizedlist>
     </listitem>




More information about the cross-lfs mailing list