Changeset 9306bac for final-system/multilib

Timestamp:

Feb 21, 2006, 1:40:36 AM (19 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

Location:

final-system/multilib

Files:

• bzip2-64bit.xml (modified) (3 diffs)
• bzip2-n32.xml (modified) (3 diffs)
• bzip2.xml (modified) (2 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>
 

final-system/multilib/bzip2-n32.xml

@@ -23 +23 @@
     <title>Installation of Bzip2</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
     <para os="m1">We need to remove the tests since they won't work on
     a multi-architecture build, and change the default lib path
@@ -49 +41 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
+    <para os="c1">Recompile the package using a non-shared library.</para>
+
 <screen os="d"><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"</userinput></screen>
-
-    <para os="m3">Now we remove the 32 bit versions of the programs so we
-    can install the n32 bit versions.</para>
-
-    <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='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -70 +49 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>cp bzip2-shared /bin/bzip2
+<screen os="j"><userinput>cp libbz2.a /usr/lib32
 cp -a libbz2.so* /lib32
-ln -s ../../lib32/libbz2.so.1.0 /usr/lib32/libbz2.so
-rm /usr/bin/{bunzip2,bzcat,bzip2}
-ln -s bzip2 /bin/bunzip2
-ln -s bzip2 /bin/bzcat</userinput></screen>
+ln -s ../../lib32/libbz2.so.1.0 /usr/lib32/libbz2.so</userinput></screen>
 
   </sect2>

final-system/multilib/bzip2.xml

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -48 +40 @@
 <screen os="e"><userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    <para os="i">Install the libraries, make
+    some necessary symbolic links, and clean up:</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+<screen os="j"><userinput>cp libbz2.a /usr/lib
+cp -a libbz2.so* /lib
+ln -s ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so</userinput></screen>
 
   </sect2>