r2193 - / trunk/BOOK trunk/BOOK/final-system/multilib trunk/BOOK/introduction/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Aug 8 12:47:58 PDT 2006


Author: jim
Date: 2006-08-08 13:47:56 -0600 (Tue, 08 Aug 2006)
New Revision: 2193

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/final-system/multilib/bzip2-64bit.xml
   trunk/BOOK/final-system/multilib/bzip2-n32.xml
   trunk/BOOK/final-system/multilib/bzip2.xml
   trunk/BOOK/introduction/common/changelog.xml
Log:
 r5034 at server (orig r2318):  jim | 2006-08-08 09:58:54 -0700
  r5033 at server:  jim | 2006-08-08 09:58:36 -0700
  Updated Bzip2 Text.
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:2317
   + b6734a72-470d-0410-b049-f317dca95413:/:2318


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:5030
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:5033
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/final-system/multilib/bzip2-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2-64bit.xml	2006-08-08 19:47:33 UTC (rev 2192)
+++ trunk/BOOK/final-system/multilib/bzip2-64bit.xml	2006-08-08 19:47:56 UTC (rev 2193)
@@ -62,8 +62,8 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2-n32.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
 <screen os="e"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
 

Modified: trunk/BOOK/final-system/multilib/bzip2-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2-n32.xml	2006-08-08 19:47:33 UTC (rev 2192)
+++ trunk/BOOK/final-system/multilib/bzip2-n32.xml	2006-08-08 19:47:56 UTC (rev 2193)
@@ -38,9 +38,11 @@
     href="bzip2.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-    <para os="c1">Recompile the package using a non-shared library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="bzip2.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="d"><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" libbz2.a</userinput></screen>
+<screen os="e"><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" libbz2.a</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"

Modified: trunk/BOOK/final-system/multilib/bzip2.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2.xml	2006-08-08 19:47:33 UTC (rev 2192)
+++ trunk/BOOK/final-system/multilib/bzip2.xml	2006-08-08 19:47:56 UTC (rev 2193)
@@ -33,9 +33,7 @@
     href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+<para os="d">Recompile the package using a non-shared library:</para>
 
 <screen os="e"><userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" libbz2.a</userinput></screen>
 

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-08-08 19:47:33 UTC (rev 2192)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-08-08 19:47:56 UTC (rev 2193)
@@ -43,6 +43,11 @@
           <para>[jim] - Moved man-pages to the beginning of the build.
           (fixes ticket #82).</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Updated the wording of Bzip2, changes were made to MIPS
+	   but not the other multilib architectures. Updated for all architectures now
+          (fixes ticket #79).</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 




More information about the cross-lfs mailing list