Changeset e6423a01 for final-system/multilib/bzip2-n32.xml

Timestamp:

Feb 21, 2006, 1:23:04 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Children:

193b7dd

Parents:

b8fddc7

Message:

r781@server (orig r779): jim | 2005-11-30 22:14:06 -0800

r836@server: jim | 2005-11-30 22:13:02 -0800
Text updates to final-system

File:

• final-system/multilib/bzip2-n32.xml (modified) (4 diffs)

final-system/multilib/bzip2-n32.xml

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="bzip2.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
-    <para>We need to remove the tests since they won't work on
+    <para os="m1">We need to remove the tests since they won't work on
     a multi-architecture build, and tell change the default lib path
     to <filename class="directory">lib32</filename>:</para>
 
-<screen><userinput>sed -i -e 's@^\(all:.*\) test@\1@g' \
+<screen os="m2"><userinput>sed -i -e 's@^\(all:.*\) test@\1@g' \
     -e 's@/lib\(/\| \|$\)@/lib32\1@g' Makefile</userinput></screen>
 
@@ -42 +42 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"
+<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"
 make clean</userinput></screen>
 
@@ -49 +49 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"</userinput></screen>
+<screen os="d"><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"</userinput></screen>
 
-    <para>Now we remove the 32 bit versions of the programs so we
+    <para os="m3">Now we remove the 32 bit versions of the programs so we
     can install the n32 bit versions.</para>
 
-<screen><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="bzip2-64bit.xml"
+    xpointer="xpointer(//*[@os='m4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="bzip2.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -68 +74 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>cp bzip2-shared /bin/bzip2
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="bzip2.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>cp bzip2-shared /bin/bzip2
 cp -a libbz2.so* /lib32
 ln -s ../../lib32/libbz2.so.1.0 /usr/lib32/libbz2.so