Changeset 4231dac for final-system/multilib

Timestamp:

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

Author:

Chris Staub <chris@…>

Children:

f358cc50

Parents:

0cacc2c

Message:

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

Location:

final-system/multilib

Files:

• bzip2-64bit.xml (modified) (1 diff)
• bzip2-n32.xml (modified) (1 diff)

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

@@ -46 +46 @@
     xpointer="xpointer(//*[@os='p6'])"/>
 
-    <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
+    <para os="m1">We need to change the default lib path
     to <filename class="directory">lib64</filename>:</para>
 
-<screen os="m2"><userinput>sed -i -e 's@^\(all:.*\) test@\1@g' \
-    -e 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile</userinput></screen>
+<screen os="m2"><userinput>sed -i 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

final-system/multilib/bzip2-n32.xml

@@ -23 +23 @@
     <title>Installation of Bzip2</title>
 
-    <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
+    <para os="m1">We need to change the default lib path
     to <filename class="directory">lib32</filename>:</para>
 
-<screen os="m2"><userinput>sed -i -e 's@^\(all:.*\) test@\1@g' \
-    -e 's@/lib\(/\| \|$\)@/lib32\1@g' Makefile</userinput></screen>
+<screen os="m2"><userinput>sed -i 's@/lib\(/\| \|$\)@/lib32\1@g' Makefile</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"