Changeset 4231dac


Ignore:
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

Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r0cacc2c r4231dac  
    4646    xpointer="xpointer(//*[@os='p6'])"/>
    4747
    48     <para os="m1">We need to remove the tests since they won't work on
    49     a multi-architecture build, and change the default lib path
     48    <para os="m1">We need to change the default lib path
    5049    to <filename class="directory">lib64</filename>:</para>
    5150
    52 <screen os="m2"><userinput>sed -i -e 's@^\(all:.*\) test@\1@g' \
    53     -e 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile</userinput></screen>
     51<screen os="m2"><userinput>sed -i 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile</userinput></screen>
    5452
    5553    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • final-system/multilib/bzip2-n32.xml

    r0cacc2c r4231dac  
    2323    <title>Installation of Bzip2</title>
    2424
    25     <para os="m1">We need to remove the tests since they won't work on
    26     a multi-architecture build, and change the default lib path
     25    <para os="m1">We need to change the default lib path
    2726    to <filename class="directory">lib32</filename>:</para>
    2827
    29 <screen os="m2"><userinput>sed -i -e 's@^\(all:.*\) test@\1@g' \
    30     -e 's@/lib\(/\| \|$\)@/lib32\1@g' Makefile</userinput></screen>
     28<screen os="m2"><userinput>sed -i 's@/lib\(/\| \|$\)@/lib32\1@g' Makefile</userinput></screen>
    3129
    3230    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • temp-system/multilib/bzip2.xml

    r0cacc2c r4231dac  
    2323    <title>Installation of Bzip2</title>
    2424
    25     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    26     href="../../final-system/multilib/bzip2-64bit.xml"
    27     xpointer="xpointer(//*[@os='m1'])"/>
     25    <para os="m1">We need to remove the tests since they won't work on
     26    a multi-architecture build, and change the default lib path
     27    to <filename class="directory">lib64</filename>:</para>
    2828
    29     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    30     href="../../final-system/multilib/bzip2-64bit.xml"
    31     xpointer="xpointer(//*[@os='m2'])"/>
     29<screen os="m2"><userinput>sed -i -e 's@^\(all:.*\) test@\1@g' \
     30    -e 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile</userinput></screen>
    3231
    3332    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Note: See TracChangeset for help on using the changeset viewer.