r1163 - in trunk/BOOK: cross-tools/sparc cross-tools/sparcv8 cross-tools/x86 cross-tools/x86_64 final-system/common introduction/common temp-system/common temp-system/multilib temp-system/sparc64 temp-system/x86 temp-system/x86_64 temp-system/x86_64-64

chris at linuxfromscratch.org chris at linuxfromscratch.org
Fri Feb 10 10:54:50 PST 2006


Author: chris
Date: 2006-02-10 11:54:48 -0700 (Fri, 10 Feb 2006)
New Revision: 1163

Modified:
   trunk/BOOK/cross-tools/sparc/binutils.xml
   trunk/BOOK/cross-tools/sparcv8/glibc.xml
   trunk/BOOK/cross-tools/x86/gcc-final.xml
   trunk/BOOK/cross-tools/x86/gcc-static.xml
   trunk/BOOK/cross-tools/x86_64/gcc-final.xml
   trunk/BOOK/cross-tools/x86_64/gcc-static.xml
   trunk/BOOK/final-system/common/glibc.xml
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/temp-system/common/bzip2.xml
   trunk/BOOK/temp-system/common/gzip.xml
   trunk/BOOK/temp-system/multilib/bzip2.xml
   trunk/BOOK/temp-system/sparc64/gcc.xml
   trunk/BOOK/temp-system/x86/gcc.xml
   trunk/BOOK/temp-system/x86_64-64/gcc.xml
   trunk/BOOK/temp-system/x86_64/gcc.xml
Log:
Added -v to more pages in cross-tools and temp-system, and other text fixes (including adding xincludes where possible)

Modified: trunk/BOOK/cross-tools/sparc/binutils.xml
===================================================================
--- trunk/BOOK/cross-tools/sparc/binutils.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/cross-tools/sparc/binutils.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -26,10 +26,13 @@
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='da'])"/>
 
-    <para os="ba">To make sure that the proper syntax is used for a couple of
-    tools, apply the following patch:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
-<screen os="bb"><userinput>patch -Np1 -i ../&binutils-posix-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/binutils.xml"

Modified: trunk/BOOK/cross-tools/sparcv8/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/sparcv8/glibc.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/cross-tools/sparcv8/glibc.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -31,9 +31,9 @@
     xpointer="xpointer(//*[@os='l1'])"/>
 
 <screen os="l2"><userinput>cd ..
-tar jxvf glibc-ports-&glibc-ports-version;.tar.bz2
+tar -jxvf glibc-ports-&glibc-ports-version;.tar.bz2
 cd glibc-ports-&glibc-ports-version;
-mv linuxthreads* ../glibc-&glibc-version;
+mv -v linuxthreads* ../glibc-&glibc-version;
 cd ../glibc-&glibc-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/cross-tools/x86/gcc-final.xml
===================================================================
--- trunk/BOOK/cross-tools/x86/gcc-final.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/cross-tools/x86/gcc-final.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -65,7 +65,7 @@
     <para os="bd">Finally, disable <option>-B</option> in <filename>configure</filename>,
     so it doesn't pick up the host's header files:</para>
 
-<screen os="be"><userinput>cp configure{,.orig}
+<screen os="be"><userinput>cp -v configure{,.orig}
 sed -e  '/FLAGS_FOR_TARGET.*\/lib\//s at -B[^ ]*/lib/@@g' configure.orig >configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/cross-tools/x86/gcc-static.xml
===================================================================
--- trunk/BOOK/cross-tools/x86/gcc-static.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/cross-tools/x86/gcc-static.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -50,7 +50,7 @@
     <para os="ai">Now alter <command>gcc</command>'s c preprocessors default
     include search path to use <filename class="directory">/tools</filename> only:</para>
 
-<screen os="aj"><userinput>cp gcc/Makefile.in{,.orig}
+<screen os="aj"><userinput>cp -v gcc/Makefile.in{,.orig}
 sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include at g" \
  gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
 

Modified: trunk/BOOK/cross-tools/x86_64/gcc-final.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64/gcc-final.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/cross-tools/x86_64/gcc-final.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -65,7 +65,7 @@
     <para os="bd">Finally, disable <option>-B</option> in <filename>configure</filename>,
     so wrong architecture libraries are not picked up as -B is not expanded by the multilib spec.:</para>
 
-<screen os="be"><userinput>cp configure{,.orig}
+<screen os="be"><userinput>cp -v configure{,.orig}
 sed -e  '/FLAGS_FOR_TARGET.*\/lib\//s at -B[^ ]*/lib/@@g' configure.orig >configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/cross-tools/x86_64/gcc-static.xml
===================================================================
--- trunk/BOOK/cross-tools/x86_64/gcc-static.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/cross-tools/x86_64/gcc-static.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -88,13 +88,21 @@
     href="../x86/gcc-static.xml"
     xpointer="xpointer(//*[@os='am'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='an'])"/>
 
-<screen><userinput>make all-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ao'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ap'])"/>
 
-<screen><userinput>make install-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aq'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/common/glibc.xml
===================================================================
--- trunk/BOOK/final-system/common/glibc.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/final-system/common/glibc.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -268,7 +268,7 @@
   </sect2>
 
   <sect2 id="conf-ld" role="configuration">
-    <title>Configuring Dynamic Loader</title>
+    <title>Configuring The Dynamic Loader</title>
 
     <indexterm zone="conf-ld">
       <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -74,7 +74,7 @@
           <para>[Chris] - Moved the text explaining why binutils
 should be the first package compiled to a more appopriate location at
 the first installation of binutils, and changed the wording in
-temp-system glibc</para>
+temp-system gettext.</para>
         </listitem>
         <listitem>
           <para>[jim] - Updated Readline and Bash patches from Upstream.</para>

Modified: trunk/BOOK/temp-system/common/bzip2.xml
===================================================================
--- trunk/BOOK/temp-system/common/bzip2.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/temp-system/common/bzip2.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -25,7 +25,7 @@
     <para os="ca">Remove the tests to since they won't work on
     a multi-architecture build:</para>
 
-<screen os="cb"><userinput>cp Makefile{,.orig}
+<screen os="cb"><userinput>cp -v Makefile{,.orig}
 sed -e 's@^\(all:.*\) test@\1 at g' Makefile.orig > Makefile</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/common/gzip.xml
===================================================================
--- trunk/BOOK/temp-system/common/gzip.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/temp-system/common/gzip.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -25,7 +25,7 @@
     <para os="aa">Setup <command>configure</command> so it can use cross-compiled
     tools:</para>
 
-<screen os="ab"><userinput>cp configure{,.orig}
+<screen os="ab"><userinput>cp -v configure{,.orig}
 sed -e "s at nm conftest@${LFS_TARGET}-&@" configure.orig > configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/multilib/bzip2.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/bzip2.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/temp-system/multilib/bzip2.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -34,7 +34,9 @@
     href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="cc"><userinput>make CC="${CC} ${BUILD64}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../64/bzip2.xml"
+    xpointer="xpointer(//*[@os='cc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"

Modified: trunk/BOOK/temp-system/sparc64/gcc.xml
===================================================================
--- trunk/BOOK/temp-system/sparc64/gcc.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/temp-system/sparc64/gcc.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -117,7 +117,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='cp'])"/>
-    <para>Install the package:</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gcc.xml"

Modified: trunk/BOOK/temp-system/x86/gcc.xml
===================================================================
--- trunk/BOOK/temp-system/x86/gcc.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/temp-system/x86/gcc.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -49,21 +49,21 @@
     <para os="cd">Now we will change <command>cpp</command>'s search path not to look in
     <filename class="directory">/usr/include</filename>:</para>
 
-<screen os="ce"><userinput>cp gcc/cppdefault.c{,.orig}
+<screen os="ce"><userinput>cp -v gcc/cppdefault.c{,.orig}
 sed -e '/#define STANDARD_INCLUDE_DIR/s@"/usr/include"@0 at g' \
    gcc/cppdefault.c.orig > gcc/cppdefault.c</userinput></screen>
 
     <para os="cf">Also, we need to set the directory searched by the fixincludes
     process for system headers, so it won't look at the host's headers:</para>
 
-<screen os="cg"><userinput>cp gcc/Makefile.in{,.orig}
+<screen os="cg"><userinput>cp -v gcc/Makefile.in{,.orig}
 sed -e 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include at g' \
    gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
 
     <para os="ch">Use our cross-compiler instead of the one GCC builds, named
     <command>xgcc</command>:</para>
 
-<screen os="ci"><userinput>cp gcc/mklibgcc.in{,.orig}
+<screen os="ci"><userinput>cp -v gcc/mklibgcc.in{,.orig}
 sed -e "s@\./xgcc@/cross-tools/bin/${CC}@g" \
    gcc/mklibgcc.in.orig > gcc/mklibgcc.in</userinput></screen>
 
@@ -119,7 +119,7 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen os="cq"><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
+<screen os="cq"><userinput>ln -sv gcc /tools/bin/cc</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/temp-system/x86_64/gcc.xml
===================================================================
--- trunk/BOOK/temp-system/x86_64/gcc.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/temp-system/x86_64/gcc.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -74,7 +74,7 @@
     results of <option>--print-multi-lib</option> from our cross-compiler,
     not the native compiler <command>gcc</command> builds now.</para>
 
-<screen os="db"><userinput>cp gcc/Makefile.in{,.orig2}
+<screen os="db"><userinput>cp -v gcc/Makefile.in{,.orig2}
 sed -e "/MULTILIBS/s@\$(GCC_FOR_TARGET)@/cross-tools/bin/${CC}@g" \
    gcc/Makefile.in.orig2 > gcc/Makefile.in</userinput></screen>
 

Modified: trunk/BOOK/temp-system/x86_64-64/gcc.xml
===================================================================
--- trunk/BOOK/temp-system/x86_64-64/gcc.xml	2006-02-10 06:41:21 UTC (rev 1162)
+++ trunk/BOOK/temp-system/x86_64-64/gcc.xml	2006-02-10 18:54:48 UTC (rev 1163)
@@ -138,8 +138,8 @@
    </filename> to <filename class="directory">/tools/lib</filename>.
     We also delete the /tools/lib64 directory:</para>
 
-<screen os="dq"><userinput>cp -ar /tools/lib64/* /tools/lib
-rm -rf /tools/lib64</userinput></screen>
+<screen os="dq"><userinput>cp -var /tools/lib64/* /tools/lib
+rm -rvf /tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gcc.xml"




More information about the cross-lfs mailing list