Changeset 9306bac


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

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • final-system/common/bzip2.xml

    r38a5094f r9306bac  
    6060    Bzip2 utilities against it.</para>
    6161
    62     <para os="d">Compile and test the package:</para>
     62    <para os="d">Recompile the package using a non-shared library and test it.</para>
    6363
    6464<screen os="e"><userinput>make</userinput></screen>

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

    r38a5094f r9306bac  
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    33     href="bzip2.xml"
     33    href="../common/bzip2.xml"
    3434    xpointer="xpointer(//*[@os='p3'])"/>
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="bzip2.xml"
     37    href="../common/bzip2.xml"
    3838    xpointer="xpointer(//*[@os='p4'])"/>
    3939
    … …  
    5656    xpointer="xpointer(//*[@os='c'])"/>
    5757
     58    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     59    href="bzip2-n32.xml"
     60    xpointer="xpointer(//*[@os='c1'])"/>
     61
    5862<screen os="e"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
    5963
    60     <para os="m3">Now we remove the 32 bit versions of the programs so we
    61     can install the 64 bit versions.</para>
    62 
    63 <screen os="m4"><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
     64    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     65    href="../common/bzip2.xml"
     66    xpointer="xpointer(//*[@os='f'])"/>
    6467
    6568    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    66     href="bzip2.xml"
     69    href="../common/bzip2.xml"
    6770    xpointer="xpointer(//*[@os='g'])"/>
    6871
    6972    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    70     href="bzip2.xml"
     73    href="../common/bzip2.xml"
    7174    xpointer="xpointer(//*[@os='h'])"/>
    7275
    7376    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    74     href="bzip2.xml"
     77    href="../common/bzip2.xml"
    7578    xpointer="xpointer(//*[@os='i'])"/>
    7679
    … …  
    7982ln -s ../../lib64/libbz2.so.1.0 /usr/lib64/libbz2.so
    8083rm /usr/bin/{bunzip2,bzcat,bzip2}
     84ln -s bzip2 /bin/bunzip2
    8185ln -s bzip2 /bin/bzcat</userinput></screen>
    8286

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

    r38a5094f r9306bac  
    2323    <title>Installation of Bzip2</title>
    2424
    25     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    26     href="bzip2.xml"
    27     xpointer="xpointer(//*[@os='p3'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    30     href="bzip2.xml"
    31     xpointer="xpointer(//*[@os='p4'])"/>
    32 
    3325    <para os="m1">We need to remove the tests since they won't work on
    3426    a multi-architecture build, and change the default lib path
    … …  
    4941    xpointer="xpointer(//*[@os='c'])"/>
    5042
     43    <para os="c1">Recompile the package using a non-shared library.</para>
     44
    5145<screen os="d"><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"</userinput></screen>
    52 
    53     <para os="m3">Now we remove the 32 bit versions of the programs so we
    54     can install the n32 bit versions.</para>
    55 
    56     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    57     href="bzip2-64bit.xml"
    58     xpointer="xpointer(//*[@os='m4'])"/>
    59 
    60     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    61     href="bzip2.xml"
    62     xpointer="xpointer(//*[@os='g'])"/>
    63 
    64     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    65     href="bzip2.xml"
    66     xpointer="xpointer(//*[@os='h'])"/>
    6746
    6847    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    7049    xpointer="xpointer(//*[@os='i'])"/>
    7150
    72 <screen os="j"><userinput>cp bzip2-shared /bin/bzip2
     51<screen os="j"><userinput>cp libbz2.a /usr/lib32
    7352cp -a libbz2.so* /lib32
    74 ln -s ../../lib32/libbz2.so.1.0 /usr/lib32/libbz2.so
    75 rm /usr/bin/{bunzip2,bzcat,bzip2}
    76 ln -s bzip2 /bin/bunzip2
    77 ln -s bzip2 /bin/bzcat</userinput></screen>
     53ln -s ../../lib32/libbz2.so.1.0 /usr/lib32/libbz2.so</userinput></screen>
    7854
    7955  </sect2>

  • final-system/multilib/bzip2.xml

    r38a5094f r9306bac  
    2525    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2626    href="../common/bzip2.xml"
    27     xpointer="xpointer(//*[@os='p3'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    30     href="../common/bzip2.xml"
    31     xpointer="xpointer(//*[@os='p4'])"/>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    34     href="../common/bzip2.xml"
    3527    xpointer="xpointer(//*[@os='a'])"/>
    3628
    … …  
    4840<screen os="e"><userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"</userinput></screen>
    4941
    50     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    51     href="../common/bzip2.xml"
    52     xpointer="xpointer(//*[@os='f'])"/>
     42    <para os="i">Install the libraries, make
     43    some necessary symbolic links, and clean up:</para>
    5344
    54     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    55     href="../common/bzip2.xml"
    56     xpointer="xpointer(//*[@os='g'])"/>
    57 
    58     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    59     href="../common/bzip2.xml"
    60     xpointer="xpointer(//*[@os='h'])"/>
    61 
    62     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    63     href="../common/bzip2.xml"
    64     xpointer="xpointer(//*[@os='i'])"/>
    65 
    66     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    67     href="../common/bzip2.xml"
    68     xpointer="xpointer(//*[@os='j'])"/>
     45<screen os="j"><userinput>cp libbz2.a /usr/lib
     46cp -a libbz2.so* /lib
     47ln -s ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so</userinput></screen>
    6948
    7049  </sect2>

  • introduction/common/changelog.xml

    r38a5094f r9306bac  
    4343          <para>[jim] - Upgraded to Module Init Tools 3.2.2.</para>
    4444        </listitem>
     45        <listitem>
     46          <para>[ken] - Bzip2 - clarify what is being tested.</para>
     47        </listitem>
    4548      </itemizedlist>
    4649    </listitem>

  • introduction/mips64/changelog.xml

    r38a5094f r9306bac  
    4040          <para>[ken] - Set prefix to '/' in multilib module-init-tools, to
    4141                prevent man pages going into /share.</para>
     42        </listitem>
     43        <listitem>
     44          <para>[ken] - Simplify the installation of multilib bzip2.
     45                Thanks to Go Moko.</para>
    4246        </listitem>
    4347      </itemizedlist>

  • introduction/sparc64/changelog.xml

    r38a5094f r9306bac  
    4040          <para>[ken] - Set prefix to '/' in multilib module-init-tools, to
    4141                prevent man pages going into /share.</para>
     42        </listitem>
     43        <listitem>
     44          <para>[ken] - Simplify the installation of multilib bzip2.
     45                Thanks to Go Moko.</para>
    4246        </listitem>
    4347      </itemizedlist>

  • introduction/x86_64/changelog.xml

    r38a5094f r9306bac  
    4040          <para>[ken] - Set prefix to '/' in multilib module-init-tools, to
    4141                prevent man pages going into /share.</para>
     42        </listitem>
     43        <listitem>
     44          <para>[ken] - Simplify the installation of multilib bzip2.
     45                Thanks to Go Moko.</para>
    4246        </listitem>
    4347      </itemizedlist>
Note: See TracChangeset for help on using the changeset viewer.