Changeset 9306bac for final-system/multilib/bzip2-64bit.xml

Timestamp:

Feb 21, 2006, 1:40:36 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Children:

beddd7f

Parents:

38a5094f

Message:

r880@server (orig r878): ken | 2005-12-09 17:54:03 -0800
Simplify bzip2 installation on multilib, based on a suggestion by Go Moko, and reword what gets tested

File:

• final-system/multilib/bzip2-64bit.xml (modified) (3 diffs)

final-system/multilib/bzip2-64bit.xml

@@ -31 +31 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='p4'])"/>
 
@@ -56 +56 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="bzip2-n32.xml"
+    xpointer="xpointer(//*[@os='c1'])"/>
+
 <screen os="e"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
 
-    <para os="m3">Now we remove the 32 bit versions of the programs so we
-    can install the 64 bit versions.</para>
-
-<screen os="m4"><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
@@ -79 +82 @@
 ln -s ../../lib64/libbz2.so.1.0 /usr/lib64/libbz2.so
 rm /usr/bin/{bunzip2,bzcat,bzip2}
+ln -s bzip2 /bin/bunzip2
 ln -s bzip2 /bin/bzcat</userinput></screen>