Changeset 4231dac for temp-system/multilib

Timestamp:

Jun 28, 2006, 10:21:31 AM (19 years ago)

Author:

Chris Staub <chris@…>

Children:

f358cc50

Parents:

0cacc2c

Message:

Corrected final-system multilib bzip2 installation so that tests are not disabled

File:

• temp-system/multilib/bzip2.xml (modified) (1 diff)

temp-system/multilib/bzip2.xml

@@ -23 +23 @@
     <title>Installation of Bzip2</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/bzip2-64bit.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    <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
+    to <filename class="directory">lib64</filename>:</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/bzip2-64bit.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+<screen os="m2"><userinput>sed -i -e 's@^\(all:.*\) test@\1@g' \
+    -e 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"