Ignore:
Timestamp:
Feb 21, 2006, 1:23:04 AM (19 years ago)
Author:
Jim Gifford <clfs@…>
Children:
193b7dd
Parents:
b8fddc7
Message:

r781@server (orig r779): jim | 2005-11-30 22:14:06 -0800

r836@server: jim | 2005-11-30 22:13:02 -0800
Text updates to final-system


Location:
final-system/multilib
Files:
59 edited
1 moved

Legend:

Unmodified
Added
Removed
  • final-system/multilib/autoconf.xml

    rb8fddc7 re6423a01  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    29 
    30     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    31     href="../common/autoconf.xml"
    32     xpointer="xpointer(//*[@os='b'])"/>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    3329
    3430    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    4844    xpointer="xpointer(//*[@os='f'])"/>
    4945
     46    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     47    href="../common/autoconf.xml"
     48    xpointer="xpointer(//*[@os='g'])"/>
     49
    5050  </sect2>
    5151
  • final-system/multilib/automake.xml

    rb8fddc7 re6423a01  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    29 
    30     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    31     href="../common/autoconf.xml"
    32     xpointer="xpointer(//*[@os='b'])"/>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    3329
    3430    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    4844    xpointer="xpointer(//*[@os='f'])"/>
    4945
     46    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     47    href="../common/autoconf.xml"
     48    xpointer="xpointer(//*[@os='g'])"/>
     49
    5050  </sect2>
    5151
  • final-system/multilib/bash.xml

    rb8fddc7 re6423a01  
    5050    xpointer="xpointer(//*[@os='g'])"/>
    5151
    52 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     52<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    5353    ./configure --prefix=/usr --bindir=/bin \
    5454    --without-bash-malloc --with-installed-readline</userinput></screen>
    55 
    56     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    57     href="../common/bash.xml"
    58     xpointer="xpointer(//*[@os='h'])"/>
    5955
    6056    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    9086    xpointer="xpointer(//*[@os='p'])"/>
    9187
     88    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     89    href="../common/bash.xml"
     90    xpointer="xpointer(//*[@os='q'])"/>
     91
    9292  </sect2>
    9393
  • final-system/multilib/bison.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of Bison</title>
    2323
    24     <para>Prepare Bison for compilation:</para>
     24    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     25    href="../common/bison.xml"
     26    xpointer="xpointer(//*[@os='a'])"/>
    2527
    26 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    2729
    28     <para>Compile the package:</para>
     30    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     31    href="../common/bison.xml"
     32    xpointer="xpointer(//*[@os='c'])"/>
    2933
    30 <screen><userinput>make</userinput></screen>
     34    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     35    href="../common/bison.xml"
     36    xpointer="xpointer(//*[@os='d'])"/>
    3137
    32     <para>To test the results, issue:
    33     <userinput>make check</userinput>.</para>
     38    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     39    href="../common/bison.xml"
     40    xpointer="xpointer(//*[@os='e'])"/>
    3441
    35     <para>Install the package:</para>
     42    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     43    href="../common/bison.xml"
     44    xpointer="xpointer(//*[@os='f'])"/>
    3645
    37 <screen><userinput>make install</userinput></screen>
     46    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     47    href="../common/bison.xml"
     48    xpointer="xpointer(//*[@os='g'])"/>
    3849
    3950  </sect2>
  • final-system/multilib/bzip2-64bit.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../common/bzip2.xml"
    26     xpointer="xpointer(//*[@os='j'])"/>
     26    xpointer="xpointer(//*[@os='p1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="../common/bzip2.xml"
    30     xpointer="xpointer(//*[@os='k'])"/>
     30    xpointer="xpointer(//*[@os='p2'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3333    href="bzip2.xml"
    34     xpointer="xpointer(//*[@os='l'])"/>
     34    xpointer="xpointer(//*[@os='p3'])"/>
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3737    href="bzip2.xml"
    38     xpointer="xpointer(//*[@os='m'])"/>
     38    xpointer="xpointer(//*[@os='p4'])"/>
    3939
    40     <para os="ba">We need to remove the tests since they won't work on
     40    <para os="m1">We need to remove the tests since they won't work on
    4141    a multi-architecture build, and tell change the default lib path
    4242    to <filename class="directory">lib64</filename>:</para>
    4343
    44 <screen os="bb"><userinput>sed -i -e 's@^\(all:.*\) test@\1@g' \
     44<screen os="m2"><userinput>sed -i -e 's@^\(all:.*\) test@\1@g' \
    4545    -e 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile</userinput></screen>
    4646
     
    4949    xpointer="xpointer(//*[@os='a'])"/>
    5050
    51 <screen><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"
     51<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"
    5252make clean</userinput></screen>
    5353
     
    5656    xpointer="xpointer(//*[@os='c'])"/>
    5757
    58 <screen><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
     58<screen os="d"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
    5959
    60     <para>Now we remove the 32 bit versions of the programs so we
     60    <para os="m3">Now we remove the 32 bit versions of the programs so we
    6161    can install the 64 bit versions.</para>
    6262
    63 <screen><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
     63<screen os="m4"><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
     64
     65    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     66    href="bzip2.xml"
     67    xpointer="xpointer(//*[@os='e'])"/>
    6468
    6569    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    7579    xpointer="xpointer(//*[@os='h'])"/>
    7680
    77 <screen><userinput>cp bzip2-shared /bin/bzip2
     81    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     82    href="bzip2.xml"
     83    xpointer="xpointer(//*[@os='i'])"/>
     84
     85<screen os="j"><userinput>cp bzip2-shared /bin/bzip2
    7886cp -a libbz2.so* /lib64
    7987ln -s ../../lib64/libbz2.so.1.0 /usr/lib64/libbz2.so
  • final-system/multilib/bzip2-n32.xml

    rb8fddc7 re6423a01  
    2525    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2626    href="bzip2.xml"
    27     xpointer="xpointer(//*[@os='l'])"/>
     27    xpointer="xpointer(//*[@os='p3'])"/>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3030    href="bzip2.xml"
    31     xpointer="xpointer(//*[@os='m'])"/>
     31    xpointer="xpointer(//*[@os='p4'])"/>
    3232
    33     <para>We need to remove the tests since they won't work on
     33    <para os="m1">We need to remove the tests since they won't work on
    3434    a multi-architecture build, and tell change the default lib path
    3535    to <filename class="directory">lib32</filename>:</para>
    3636
    37 <screen><userinput>sed -i -e 's@^\(all:.*\) test@\1@g' \
     37<screen os="m2"><userinput>sed -i -e 's@^\(all:.*\) test@\1@g' \
    3838    -e 's@/lib\(/\| \|$\)@/lib32\1@g' Makefile</userinput></screen>
    3939
     
    4242    xpointer="xpointer(//*[@os='a'])"/>
    4343
    44 <screen><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"
     44<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"
    4545make clean</userinput></screen>
    4646
     
    4949    xpointer="xpointer(//*[@os='c'])"/>
    5050
    51 <screen><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"</userinput></screen>
     51<screen os="d"><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"</userinput></screen>
    5252
    53     <para>Now we remove the 32 bit versions of the programs so we
     53    <para os="m3">Now we remove the 32 bit versions of the programs so we
    5454    can install the n32 bit versions.</para>
    5555
    56 <screen><userinput>rm -f /usr/bin/bz* /bin/bz*</userinput></screen>
     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='e'])"/>
    5763
    5864    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    6874    xpointer="xpointer(//*[@os='h'])"/>
    6975
    70 <screen><userinput>cp bzip2-shared /bin/bzip2
     76    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     77    href="bzip2.xml"
     78    xpointer="xpointer(//*[@os='i'])"/>
     79
     80<screen os="j"><userinput>cp bzip2-shared /bin/bzip2
    7181cp -a libbz2.so* /lib32
    7282ln -s ../../lib32/libbz2.so.1.0 /usr/lib32/libbz2.so
  • final-system/multilib/bzip2.xml

    rb8fddc7 re6423a01  
    2525    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2626    href="../common/bzip2.xml"
    27     xpointer="xpointer(//*[@os='l'])"/>
     27    xpointer="xpointer(//*[@os='p3'])"/>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3030    href="../common/bzip2.xml"
    31     xpointer="xpointer(//*[@os='m'])"/>
     31    xpointer="xpointer(//*[@os='p4'])"/>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    3535    xpointer="xpointer(//*[@os='a'])"/>
    3636
    37 <screen><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"
     37<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"
    3838make clean</userinput></screen>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="../common/bzip2.xml"
    42     xpointer="xpointer(//*[@os='b'])"/>
    4339
    4440    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    4642    xpointer="xpointer(//*[@os='c'])"/>
    4743
    48 <screen><userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"</userinput></screen>
    49 
    5044    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5145    href="../common/bzip2.xml"
    52     xpointer="xpointer(//*[@os='e'])"/>
     46    xpointer="xpointer(//*[@os='d'])"/>
     47
     48<screen os="e"><userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"</userinput></screen>
    5349
    5450    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    6864    xpointer="xpointer(//*[@os='i'])"/>
    6965
     66    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     67    href="../common/bzip2.xml"
     68    xpointer="xpointer(//*[@os='j'])"/>
     69
    7070  </sect2>
    7171
  • final-system/multilib/diffutils.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of Diffutils</title>
    2323
    24     <para>Prepare Diffutils for compilation:</para>
     24    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     25    href="../common/diffutils.xml"
     26    xpointer="xpointer(//*[@os='a'])"/>
    2527
    26 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    2729
    28     <para>Compile the package:</para>
     30    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     31    href="../common/diffutils.xml"
     32    xpointer="xpointer(//*[@os='c'])"/>
    2933
    30 <screen><userinput>make</userinput></screen>
     34    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     35    href="../common/diffutils.xml"
     36    xpointer="xpointer(//*[@os='d'])"/>
    3137
    32     <para>This package does not come with a test suite.</para>
     38    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     39    href="../common/diffutils.xml"
     40    xpointer="xpointer(//*[@os='e'])"/>
    3341
    34     <para>Install the package:</para>
     42    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     43    href="../common/diffutils.xml"
     44    xpointer="xpointer(//*[@os='f'])"/>
    3545
    36 <screen><userinput>make install</userinput></screen>
     46    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     47    href="../common/diffutils.xml"
     48    xpointer="xpointer(//*[@os='g'])"/>
    3749
    3850  </sect2>
  • final-system/multilib/e2fsprogs-64bit.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of E2fsprogs</title>
    2323
    24     <para>Change the library directory to <filename
     24    <para os="m3">Change the library directory to <filename
    2525    class="directory">lib64</filename>:</para>
    2626
    27 <screen><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib64@g' configure</userinput></screen>
     27<screen os="m4"><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib64@g' configure</userinput></screen>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    3939    xpointer="xpointer(//*[@os='c'])"/>
    4040
    41 <screen><userinput>CC="gcc ${BUILD64}" ../configure --prefix=/usr \
     41<screen os="d"><userinput>CC="gcc ${BUILD64}" ../configure --prefix=/usr \
    4242    --with-root-prefix="" --enable-elf-shlibs --disable-evms</userinput></screen>
    4343
     
    5050    xpointer="xpointer(//*[@os='e'])"/>
    5151
    52 <screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
    53 
    54     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    55     href="../common/e2fsprogs.xml"
    56     xpointer="xpointer(//*[@os='g'])"/>
     52<screen os="g"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
    5753
    5854    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    6561
    6662    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    67     href="e2fsprogs.xml"
     63    href="../common/e2fsprogs.xml"
    6864    xpointer="xpointer(//*[@os='j'])"/>
    6965
     
    7167    href="e2fsprogs.xml"
    7268    xpointer="xpointer(//*[@os='k'])"/>
     69
     70    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     71    href="e2fsprogs.xml"
     72    xpointer="xpointer(//*[@os='l'])"/>
    7373
    7474  </sect2>
  • final-system/multilib/e2fsprogs-n32.xml

    rb8fddc7 re6423a01  
    2323    <title>Installation of E2fsprogs</title>
    2424
    25     <para>Change the library directory to <filename
     25    <para os="m3">Change the library directory to <filename
    2626    class="directory">lib32</filename>:</para>
    2727
    28 <screen><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib32@g' configure</userinput></screen>
     28<screen os="m4"><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib32@g' configure</userinput></screen>
    2929
    3030    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    4040    xpointer="xpointer(//*[@os='c'])"/>
    4141
    42 <screen><userinput>CC="gcc ${BUILDN32}" ../configure --prefix=/usr \
     42<screen os="d"><userinput>CC="gcc ${BUILDN32}" ../configure --prefix=/usr \
    4343    --with-root-prefix="" --enable-elf-shlibs --disable-evms</userinput></screen>
    4444
     
    4747    xpointer="xpointer(//*[@os='d'])"/>
    4848
    49     <para>Compile the libraries:</para>
    50 
    51 <screen><userinput>make CC="gcc ${BUILDN32}" libs</userinput></screen>
    52 
    5349    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5450    href="e2fsprogs.xml"
    55     xpointer="xpointer(//*[@os='j'])"/>
     51    xpointer="xpointer(//*[@os='m1'])"/>
     52
     53<screen os="m2"><userinput>make CC="gcc ${BUILDN32}" libs</userinput></screen>
    5654
    5755    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5856    href="e2fsprogs.xml"
    5957    xpointer="xpointer(//*[@os='k'])"/>
     58
     59    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     60    href="e2fsprogs.xml"
     61    xpointer="xpointer(//*[@os='l'])"/>
    6062
    6163  </sect2>
  • final-system/multilib/e2fsprogs.xml

    rb8fddc7 re6423a01  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37 <screen><userinput>CC="gcc ${BUILD32}" ../configure --prefix=/usr \
     37<screen os="d"><userinput>CC="gcc ${BUILD32}" ../configure --prefix=/usr \
    3838    --with-root-prefix="" --enable-elf-shlibs --disable-evms</userinput></screen>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    4141    href="../common/e2fsprogs.xml"
    42     xpointer="xpointer(//*[@os='d'])"/>
     42    xpointer="xpointer(//*[@os='e'])"/>
    4343
    44     <para>Compile the libraries:</para>
     44    <para os="m1">Compile the libraries:</para>
    4545
    46 <screen><userinput>make libs</userinput></screen>
    47 
    48     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    49     href="../common/e2fsprogs.xml"
    50     xpointer="xpointer(//*[@os='j'])"/>
     46<screen os="m2"><userinput>make CC="gcc ${BUILD32}" libs</userinput></screen>
    5147
    5248    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5349    href="../common/e2fsprogs.xml"
    5450    xpointer="xpointer(//*[@os='k'])"/>
     51
     52    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     53    href="../common/e2fsprogs.xml"
     54    xpointer="xpointer(//*[@os='l'])"/>
    5555
    5656  </sect2>
  • final-system/multilib/file-64bit.xml

    rb8fddc7 re6423a01  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    2929   --libdir=/usr/lib64</userinput></screen>
    3030
  • final-system/multilib/file.xml

    rb8fddc7 re6423a01  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
    3030
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • final-system/multilib/findutils.xml

    rb8fddc7 re6423a01  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    2929    --libexecdir=/usr/lib64/locate --localstatedir=/var/lib64/locate</userinput></screen>
    30 
    31     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    32     href="../common/findutils.xml"
    33     xpointer="xpointer(//*[@os='b'])"/>
    3430
    3531    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5248    href="../common/findutils.xml"
    5349    xpointer="xpointer(//*[@os='g'])"/>
     50
     51    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     52    href="../common/findutils.xml"
     53    xpointer="xpointer(//*[@os='h'])"/>
    5454
    5555  </sect2>
  • final-system/multilib/flex-64bit.xml

    rb8fddc7 re6423a01  
    4242    xpointer="xpointer(//*[@os='e'])"/>
    4343
    44 <screen os="m4"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     44<screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    4545    --libdir=/usr/lib64</userinput></screen>
    4646
    4747    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    4848    href="flex.xml"
    49     xpointer="xpointer(//*[@os='f'])"/>
     49    xpointer="xpointer(//*[@os='g'])"/>
    5050
    5151    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5252    href="../common/flex.xml"
    53     xpointer="xpointer(//*[@os='g'])"/>
    54 
    55     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    56     href="flex.xml"
    5753    xpointer="xpointer(//*[@os='h'])"/>
    5854
    5955    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    60     href="flex.xml"
     56    href="../common/flex.xml"
    6157    xpointer="xpointer(//*[@os='i'])"/>
    6258
     
    6561    xpointer="xpointer(//*[@os='j'])"/>
    6662
    67     <para os="k">There are some packages that expect to find the
     63    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     64    href="flex.xml"
     65    xpointer="xpointer(//*[@os='k'])"/>
     66
     67    <para os="l">There are some packages that expect to find the
    6868    <filename class="libraryfile">lex</filename> library in <filename
    6969    class="directory">/usr/lib64</filename>. Create a symlink to account for
    7070    this:</para>
    7171
    72 <screen os="l"><userinput>ln -s libfl.a /usr/lib64/libl.a</userinput></screen>
    73 
    74     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    75     href="../common/flex.xml"
    76     xpointer="xpointer(//*[@os='m'])"/>
     72<screen os="m"><userinput>ln -s libfl.a /usr/lib64/libl.a</userinput></screen>
    7773
    7874    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    7975    href="../common/flex.xml"
    8076    xpointer="xpointer(//*[@os='n'])"/>
     77
     78    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     79    href="../common/flex.xml"
     80    xpointer="xpointer(//*[@os='o'])"/>
    8181
    8282  </sect2>
  • final-system/multilib/flex.xml

    rb8fddc7 re6423a01  
    4343    xpointer="xpointer(//*[@os='e'])"/>
    4444
    45 <screen os="m1"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
     45<screen os="f"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
    4646
    4747    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    4848    href="../common/flex.xml"
    49     xpointer="xpointer(//*[@os='f'])"/>
     49    xpointer="xpointer(//*[@os='g'])"/>
    5050
    51 <screen os="m2"><userinput>make libfl.a</userinput></screen>
    52 
    53     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    54     href="../common/flex.xml"
    55     xpointer="xpointer(//*[@os='h'])"/>
    56 
    57     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    58     href="../common/flex.xml"
    59     xpointer="xpointer(//*[@os='i'])"/>
     51<screen os="h"><userinput>make libfl.a</userinput></screen>
    6052
    6153    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    7163    xpointer="xpointer(//*[@os='l'])"/>
    7264
     65    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     66    href="../common/flex.xml"
     67    xpointer="xpointer(//*[@os='m'])"/>
     68
    7369  </sect2>
    7470
  • final-system/multilib/gawk.xml

    rb8fddc7 re6423a01  
    3434    xpointer="xpointer(//*[@os='c'])"/>
    3535
    36 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     36<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    3737   --libexecdir=/usr/lib64</userinput></screen>
    3838
  • final-system/multilib/gettext-64bit.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of Gettext</title>
    2323
    24     <para>Prepare Gettext for compilation:</para>
     24   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     25    href="../common/gettext.xml"
     26    xpointer="xpointer(//*[@os='a'])"/>
    2527
    26 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    2729   ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    2830
    29     <para>Compile the package:</para>
     31   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     32    href="../common/gettext.xml"
     33    xpointer="xpointer(//*[@os='c'])"/>
    3034
    31 <screen><userinput>make</userinput></screen>
     35   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     36    href="../common/gettext.xml"
     37    xpointer="xpointer(//*[@os='d'])"/>
    3238
    33     <para>To test the results, issue: <userinput>make check</userinput>.</para>
     39   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     40    href="../common/gettext.xml"
     41    xpointer="xpointer(//*[@os='e'])"/>
    3442
    35     <para>Install the package:</para>
     43   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     44    href="../common/gettext.xml"
     45    xpointer="xpointer(//*[@os='f'])"/>
    3646
    37 <screen><userinput>make install</userinput></screen>
     47   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     48    href="../common/gettext.xml"
     49    xpointer="xpointer(//*[@os='g'])"/>
    3850
    3951  </sect2>
  • final-system/multilib/gettext-n32.xml

    rb8fddc7 re6423a01  
    2323    <title>Installation of Gettext</title>
    2424
    25     <para>Prepare Gettext for compilation:</para>
     25   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     26    href="../common/gettext.xml"
     27    xpointer="xpointer(//*[@os='a'])"/>
    2628
    27 <screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
     29<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    2830   ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
    2931
    30     <para>Compile the package:</para>
     32   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    href="../common/gettext.xml"
     34    xpointer="xpointer(//*[@os='c'])"/>
    3135
    32 <screen><userinput>make</userinput></screen>
     36   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    href="../common/gettext.xml"
     38    xpointer="xpointer(//*[@os='d'])"/>
    3339
    34     <para>To test the results, issue: <userinput>make check</userinput>.</para>
     40   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     41    href="../common/gettext.xml"
     42    xpointer="xpointer(//*[@os='e'])"/>
    3543
    36     <para>Install the package:</para>
     44   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    href="../common/gettext.xml"
     46    xpointer="xpointer(//*[@os='f'])"/>
    3747
    38 <screen><userinput>make install</userinput></screen>
     48   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     49    href="../common/gettext.xml"
     50    xpointer="xpointer(//*[@os='g'])"/>
    3951
    4052  </sect2>
  • final-system/multilib/gettext.xml

    rb8fddc7 re6423a01  
    2323    <title>Installation of Gettext</title>
    2424
    25     <para>Prepare Gettext for compilation:</para>
     25    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     26    href="../common/gettext.xml"
     27    xpointer="xpointer(//*[@os='a'])"/>
    2628
    27 <screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
     29<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    2830   ./configure --prefix=/usr</userinput></screen>
    2931
    30     <para>Compile the package:</para>
     32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    href="../common/gettext.xml"
     34    xpointer="xpointer(//*[@os='c'])"/>
    3135
    32 <screen><userinput>make</userinput></screen>
     36    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    href="../common/gettext.xml"
     38    xpointer="xpointer(//*[@os='d'])"/>
    3339
    34     <para>To test the results, issue: <userinput>make check</userinput>.</para>
     40    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     41    href="../common/gettext.xml"
     42    xpointer="xpointer(//*[@os='e'])"/>
    3543
    36     <para>Install the package:</para>
     44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    href="../common/gettext.xml"
     46    xpointer="xpointer(//*[@os='f'])"/>
    3747
    38 <screen><userinput>make install</userinput></screen>
     48    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     49    href="../common/gettext.xml"
     50    xpointer="xpointer(//*[@os='g'])"/>
    3951
    4052  </sect2>
  • final-system/multilib/grep.xml

    rb8fddc7 re6423a01  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="aa"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    2929   --bindir=/bin</userinput></screen>
    3030
  • final-system/multilib/groff.xml

    rb8fddc7 re6423a01  
    3030    xpointer="xpointer(//*[@os='b'])"/>
    3131
    32 <screen><userinput>PAGE=<replaceable>[paper_size]</replaceable> CC="gcc ${BUILD64}" \
     32<screen os="c"><userinput>PAGE=<replaceable>[paper_size]</replaceable> CC="gcc ${BUILD64}" \
    3333   CXX="g++ ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    34 
    35     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    36     href="../common/groff.xml"
    37     xpointer="xpointer(//*[@os='c'])"/>
    3834
    3935    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5753    xpointer="xpointer(//*[@os='h'])"/>
    5854
     55    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     56    href="../common/groff.xml"
     57    xpointer="xpointer(//*[@os='i'])"/>
     58
    5959  </sect2>
    6060
  • final-system/multilib/gzip.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../common/gzip.xml"
    26     xpointer="xpointer(//*[@os='a'])"/>
     26    xpointer="xpointer(//*[@os='p1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="../common/gzip.xml"
    30     xpointer="xpointer(//*[@os='b'])"/>
     30    xpointer="xpointer(//*[@os='p2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    href="../common/gzip.xml"
     34    xpointer="xpointer(//*[@os='a'])"/>
     35
     36<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    3137
    3238    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3339    href="../common/gzip.xml"
    3440    xpointer="xpointer(//*[@os='c'])"/>
    35 
    36 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    3741
    3842    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    6468    xpointer="xpointer(//*[@os='j'])"/>
    6569
    66     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    67     href="../common/gzip.xml"
    68     xpointer="xpointer(//*[@os='k'])"/>
    69 
    7070  </sect2>
    7171
  • final-system/multilib/inetutils.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../common/inetutils.xml"
    26     xpointer="xpointer(//*[@os='a'])"/>
     26    xpointer="xpointer(//*[@os='p1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="../common/inetutils.xml"
    30     xpointer="xpointer(//*[@os='b'])"/>
     30    xpointer="xpointer(//*[@os='p2'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3333    href="../common/inetutils.xml"
    34     xpointer="xpointer(//*[@os='b1'])"/>
     34    xpointer="xpointer(//*[@os='p3'])"/>
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3737    href="../common/inetutils.xml"
    38     xpointer="xpointer(//*[@os='b2'])"/>
     38    xpointer="xpointer(//*[@os='p4'])"/>
     39
     40    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     41    href="../common/inetutils.xml"
     42    xpointer="xpointer(//*[@os='a'])"/>
     43
     44<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libexecdir=/usr/sbin \
     45    --sysconfdir=/etc --localstatedir=/var \
     46    --disable-logger --disable-syslogd \
     47    --disable-whois --disable-servers</userinput></screen>
    3948
    4049    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    4150    href="../common/inetutils.xml"
    4251    xpointer="xpointer(//*[@os='c'])"/>
    43 
    44 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libexecdir=/usr/sbin \
    45     --sysconfdir=/etc --localstatedir=/var \
    46     --disable-logger --disable-syslogd \
    47     --disable-whois --disable-servers</userinput></screen>
    4852
    4953    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    7175    xpointer="xpointer(//*[@os='i'])"/>
    7276
    73     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    74     href="../common/inetutils.xml"
    75     xpointer="xpointer(//*[@os='j'])"/>
    76 
    7777  </sect2>
    7878
  • final-system/multilib/iproute2.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../common/iproute2.xml"
     26    xpointer="xpointer(//*[@os='s1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     29    href="../common/iproute2.xml"
     30    xpointer="xpointer(//*[@os='s2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    href="../common/iproute2.xml"
    2634    xpointer="xpointer(//*[@os='a'])"/>
    2735
     
    3442    xpointer="xpointer(//*[@os='c'])"/>
    3543
    36     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../common/iproute2.xml"
    38     xpointer="xpointer(//*[@os='d'])"/>
     44<screen os="d"><userinput>make CC="gcc ${BUILD64}" SBINDIR=/sbin</userinput></screen>
    3945
    4046    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    4147    href="../common/iproute2.xml"
    4248    xpointer="xpointer(//*[@os='e'])"/>
    43 
    44 <screen><userinput>make CC="gcc ${BUILD64}" SBINDIR=/sbin</userinput></screen>
    4549
    4650    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5256    xpointer="xpointer(//*[@os='g'])"/>
    5357
    54     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    55     href="../common/iproute2.xml"
    56     xpointer="xpointer(//*[@os='h'])"/>
    57 
    5858  </sect2>
    5959
  • final-system/multilib/kbd.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../common/kbd.xml"
    26     xpointer="xpointer(//*[@os='a1'])"/>
     26    xpointer="xpointer(//*[@os='p1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="../common/kbd.xml"
    30     xpointer="xpointer(//*[@os='a2'])"/>
     30    xpointer="xpointer(//*[@os='p2'])"/>
    3131
    32     <para>Prepare Kbd for compilation:</para>
     32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    href="../common/kbd.xml"
     34    xpointer="xpointer(//*[@os='a'])"/>
    3335
    34 <screen><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
     36<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
    3537
    36     <para>Compile the package:</para>
     38    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     39    href="../common/kbd.xml"
     40    xpointer="xpointer(//*[@os='c'])"/>
    3741
    38 <screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
     42<screen os="d"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
    3943
    40     <para>Install the package:</para>
     44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    href="../common/kbd.xml"
     46    xpointer="xpointer(//*[@os='e'])"/>
    4147
    42 <screen><userinput>make install</userinput></screen>
     48    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     49    href="../common/kbd.xml"
     50    xpointer="xpointer(//*[@os='f'])"/>
    4351
    4452  </sect2>
  • final-system/multilib/less.xml

    rb8fddc7 re6423a01  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    2929    --sysconfdir=/etc</userinput></screen>
    30 
    31     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    32     href="../common/less.xml"
    33     xpointer="xpointer(//*[@os='b'])"/>
    3430
    3531    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5753    xpointer="xpointer(//*[@os='h'])"/>
    5854
     55    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     56    href="../common/less.xml"
     57    xpointer="xpointer(//*[@os='i'])"/>
     58
    5959  </sect2>
    6060
  • final-system/multilib/libtool-64bit.xml

    rb8fddc7 re6423a01  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    2929   --libdir=/usr/lib64</userinput></screen>
    30 
    31     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    32     href="libtool.xml"
    33     xpointer="xpointer(//*[@os='b'])"/>
    3430
    3531    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5046
    5147    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    52     href="../common/libtool.xml"
     48    href="libtool.xml"
    5349    xpointer="xpointer(//*[@os='g'])"/>
    5450
     
    5652    href="../common/libtool.xml"
    5753    xpointer="xpointer(//*[@os='h'])"/>
     54
     55    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     56    href="../common/libtool.xml"
     57    xpointer="xpointer(//*[@os='i'])"/>
    5858
    5959  </sect2>
  • final-system/multilib/libtool-n32.xml

    rb8fddc7 re6423a01  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
     29<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
    3030   --libdir=/usr/lib32</userinput></screen>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    33     href="libtool.xml"
    34     xpointer="xpointer(//*[@os='b'])"/>
    3531
    3632    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5046    xpointer="xpointer(//*[@os='f'])"/>
    5147
     48    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     49    href="libtool.xml"
     50    xpointer="xpointer(//*[@os='g'])"/>
     51
    5252  </sect2>
    5353
  • final-system/multilib/libtool.xml

    rb8fddc7 re6423a01  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
    30 
    31     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    32     href="../common/libtool.xml"
    33     xpointer="xpointer(//*[@os='b'])"/>
     29<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
    3430
    3531    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    4945    xpointer="xpointer(//*[@os='f'])"/>
    5046
     47    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     48    href="../common/libtool.xml"
     49    xpointer="xpointer(//*[@os='g'])"/>
     50
    5151  </sect2>
    5252
  • final-system/multilib/m4.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of M4</title>
    2323
    24     <para>Prepare M4 for compilation:</para>
     24   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     25    href="../common/m4.xml"
     26    xpointer="xpointer(//*[@os='a'])"/>
    2527
    26 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    2729
    28     <para>Compile the package:</para>
     30   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     31    href="../common/m4.xml"
     32    xpointer="xpointer(//*[@os='c'])"/>
    2933
    30 <screen><userinput>make</userinput></screen>
     34   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     35    href="../common/m4.xml"
     36    xpointer="xpointer(//*[@os='d'])"/>
    3137
    32     <para>To test the results, issue:
    33     <userinput>make check</userinput>.</para>
     38   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     39    href="../common/m4.xml"
     40    xpointer="xpointer(//*[@os='e'])"/>
    3441
    35     <para>Install the package:</para>
     42   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     43    href="../common/m4.xml"
     44    xpointer="xpointer(//*[@os='f'])"/>
    3645
    37 <screen><userinput>make install</userinput></screen>
     46   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     47    href="../common/m4.xml"
     48    xpointer="xpointer(//*[@os='g'])"/>
    3849
    3950  </sect2>
  • final-system/multilib/make.xml

    rb8fddc7 re6423a01  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    2929
    3030    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • final-system/multilib/man.xml

    rb8fddc7 re6423a01  
    4646    xpointer="xpointer(//*[@os='f'])"/>
    4747
    48 <screen><userinput>CC="gcc ${BUILD64}" ./configure -confdir=/etc</userinput></screen>
    49 
    50     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    51     href="../common/man.xml"
    52     xpointer="xpointer(//*[@os='g'])"/>
     48<screen os="g"><userinput>CC="gcc ${BUILD64}" ./configure -confdir=/etc</userinput></screen>
    5349
    5450    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    9288    xpointer="xpointer(//*[@os='q'])"/>
    9389
     90    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     91    href="../common/man.xml"
     92    xpointer="xpointer(//*[@os='r'])"/>
     93
    9494  </sect2>
    9595
  • final-system/multilib/mktemp.xml

    rb8fddc7 re6423a01  
    3434    xpointer="xpointer(//*[@os='c'])"/>
    3535
    36 <screen os="c1"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --with-libc</userinput></screen>
    37 
    38     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    39     href="../common/mktemp.xml"
    40     xpointer="xpointer(//*[@os='d'])"/>
     36<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --with-libc</userinput></screen>
    4137
    4238    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5652    xpointer="xpointer(//*[@os='h'])"/>
    5753
     54    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     55    href="../common/mktemp.xml"
     56    xpointer="xpointer(//*[@os='i'])"/>
     57
    5858  </sect2>
    5959
  • final-system/multilib/module-init-tools.xml

    rb8fddc7 re6423a01  
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3333    href="../common/module-init-tools.xml"
    34     xpointer="xpointer(//*[@os='g'])"/>
     34    xpointer="xpointer(//*[@os='c'])"/>
    3535
    36 <screen os="g1"><userinput>tar -xvf ../module-init-tools-testsuite-&module-init-tools-version;.tar.bz2 --strip-path=1 &amp;&amp;
     36<screen os="d"><userinput>tar -xvf ../module-init-tools-testsuite-&module-init-tools-version;.tar.bz2 --strip-path=1 &amp;&amp;
    3737CC="gcc ${BUILD64}" ./configure &amp;&amp;
    3838make check &amp;&amp;
     
    4141    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    4242    href="../common/module-init-tools.xml"
    43     xpointer="xpointer(//*[@os='c'])"/>
    44 
    45 <screen os="c1"><userinput>CC="gcc ${BUILD64}" ./configure --prefix="" --enable-zlib</userinput></screen>
    46 
    47     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    48     href="../common/module-init-tools.xml"
    49     xpointer="xpointer(//*[@os='d'])"/>
    50 
    51     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    52     href="../common/module-init-tools.xml"
    5343    xpointer="xpointer(//*[@os='e'])"/>
    5444
    55     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    56     href="../common/module-init-tools.xml"
    57     xpointer="xpointer(//*[@os='f'])"/>
     45<screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure --prefix="" --enable-zlib</userinput></screen>
    5846
    5947    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    6957    xpointer="xpointer(//*[@os='i'])"/>
    7058
     59    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     60    href="../common/module-init-tools.xml"
     61    xpointer="xpointer(//*[@os='j'])"/>
     62
     63    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     64    href="../common/module-init-tools.xml"
     65    xpointer="xpointer(//*[@os='k'])"/>
     66
    7167  </sect2>
    7268
  • final-system/multilib/ncurses-64bit.xml

    rb8fddc7 re6423a01  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    2929   ./configure --prefix=/usr --libdir=/lib64 \
    3030   --with-shared --without-debug</userinput></screen>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    33     href="ncurses.xml"
    34     xpointer="xpointer(//*[@os='b'])"/>
    3531
    3632    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5450    xpointer="xpointer(//*[@os='g'])"/>
    5551
    56 <screen><userinput>mv /lib64/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib64</userinput></screen>
     52    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     53    href="ncurses.xml"
     54    xpointer="xpointer(//*[@os='h'])"/>
    5755
    58     <para>Create symlinks in <filename class="directory">/usr/lib64:</filename></para>
     56<screen os="i"><userinput>mv /lib64/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib64</userinput></screen>
    5957
    60 <screen><userinput>rm /lib64/lib{ncurses,menu,panel,form,curses}.so
     58    <para os="j">Create symlinks in <filename class="directory">/usr/lib64:</filename></para>
     59
     60<screen os="k"><userinput>rm /lib64/lib{ncurses,menu,panel,form,curses}.so
    6161ln -sf ../../lib64/libncurses.so.5 /usr/lib64/libncurses.so
    6262ln -sf ../../lib64/libncurses.so.5 /usr/lib64/libcurses.so
     
    6767    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6868    href="ncurses.xml"
    69     xpointer="xpointer(//*[@os='k'])"/>
     69    xpointer="xpointer(//*[@os='l'])"/>
    7070
    71 <screen><userinput>chmod 755 /lib64/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
     71<screen os="m"><userinput>chmod 755 /lib64/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
    7272
    7373  </sect2>
  • final-system/multilib/ncurses-n32.xml

    rb8fddc7 re6423a01  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
     29<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    3030   ./configure --prefix=/usr --libdir=/lib32 \
    3131   --with-shared --without-debug</userinput></screen>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    34     href="ncurses.xml"
    35     xpointer="xpointer(//*[@os='b'])"/>
    3632
    3733    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5551    xpointer="xpointer(//*[@os='g'])"/>
    5652
    57 <screen><userinput>mv /lib32/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib32</userinput></screen>
     53    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     54    href="ncurses.xml"
     55    xpointer="xpointer(//*[@os='h'])"/>
    5856
    59     <para>Create symlinks in <filename class="directory">/usr/lib32:</filename></para>
     57<screen os="i"><userinput>mv /lib32/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib32</userinput></screen>
    6058
    61 <screen><userinput>rm /lib32/lib{ncurses,menu,panel,form,curses}.so
     59    <para os="j">Create symlinks in <filename class="directory">/usr/lib32:</filename></para>
     60
     61<screen os="k"><userinput>rm /lib32/lib{ncurses,menu,panel,form,curses}.so
    6262ln -sf ../../lib32/libncurses.so.5 /usr/lib32/libncurses.so
    6363ln -sf ../../lib32/libncurses.so.5 /usr/lib32/libcurses.so
     
    6868    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6969    href="ncurses.xml"
    70     xpointer="xpointer(//*[@os='k'])"/>
     70    xpointer="xpointer(//*[@os='l'])"/>
    7171
    72 <screen><userinput>chmod 755 /lib32/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
     72<screen os="m"><userinput>chmod 755 /lib32/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
    7373
    7474  </sect2>
  • final-system/multilib/ncurses.xml

    rb8fddc7 re6423a01  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
     29<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    3030   ./configure --prefix=/usr --libdir=/lib \
    3131   --with-shared --without-debug</userinput></screen>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    34     href="../common/ncurses.xml"
    35     xpointer="xpointer(//*[@os='b'])"/>
    3632
    3733    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    7571    xpointer="xpointer(//*[@os='l'])"/>
    7672
     73    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     74    href="../common/ncurses.xml"
     75    xpointer="xpointer(//*[@os='m'])"/>
     76
    7777  </sect2>
    7878
  • final-system/multilib/patch.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of Patch</title>
    2323
    24     <para>Prepare Patch for compilation:</para>
     24    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     25    href="../common/patch.xml"
     26    xpointer="xpointer(//*[@os='a'])"/>
    2527
    26 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    2729
    28     <para>Compile the package:</para>
     30    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     31    href="../common/patch.xml"
     32    xpointer="xpointer(//*[@os='c'])"/>
    2933
    30 <screen><userinput>make</userinput></screen>
     34    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     35    href="../common/patch.xml"
     36    xpointer="xpointer(//*[@os='d'])"/>
    3137
    32     <para>This package does not come with a test suite.</para>
     38    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     39    href="../common/patch.xml"
     40    xpointer="xpointer(//*[@os='e'])"/>
    3341
    34     <para>Install the package:</para>
     42    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     43    href="../common/patch.xml"
     44    xpointer="xpointer(//*[@os='f'])"/>
    3545
    36 <screen><userinput>make install</userinput></screen>
     46    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     47    href="../common/patch.xml"
     48    xpointer="xpointer(//*[@os='g'])"/>
    3749
    3850  </sect2>
  • final-system/multilib/perl-64bit.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of Perl</title>
    2323
    24     <para>In multilib builds we install compilers and libraries for each available
     24    <para os="m1">In multilib builds we install compilers and libraries for each available
    2525    architecture.  The description below says that perl installs several hundred
    2626    libraries, but they are used by invoking <command>perl</command>, not by linking
     
    3131    therefore only install one version.</para>
    3232
    33     <para>Perl does not, by default, know about library directories with names other
     33    <para os="p1">Perl does not, by default, know about library directories with names other
    3434    than lib, such as lib64.  The following patch will allow it to install to lib64.</para>
    3535
    36 <screen><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
     36<screen os="p2"><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
    3737
    38     <para>There is a further (possibly cosmetic) anomaly - if we install perl and
     38    <para os="p3">There is a further (possibly cosmetic) anomaly - if we install perl and
    3939    then run <command>perl -V</command> it will claim that libc is in /lib.  The
    4040    following patch fixes this, but only takes effect when <command>make install
    4141    </command> is run.</para>
    4242
    43 <screen><userinput>patch -Np1 -i ../&perl-lib64-patch;</userinput></screen>
     43<screen os="p4"><userinput>patch -Np1 -i ../&perl-lib64-patch;</userinput></screen>
    4444
    45     <para>We still need to tell perl to actually use lib64</para>
     45    <para os="m2">We still need to tell perl to actually use lib64</para>
    4646
    47 <screen><userinput>echo 'installstyle="lib64/perl5"' >>hints/linux.sh</userinput></screen>
     47<screen os="m3"><userinput>echo 'installstyle="lib64/perl5"' >>hints/linux.sh</userinput></screen>
    4848
    4949    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5151    xpointer="xpointer(//*[@os='a'])"/>
    5252
    53 <screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" \
     53<screen os="b"><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" \
    5454   -Dlibpth="/usr/local/lib64 /lib64 /usr/lib64" \
    5555   -Dcc="gcc ${BUILD64}"</userinput></screen>
    5656
    57     <variablelist>
     57    <variablelist os="m4">
    5858      <title>The meaning of the new configure option:</title>
    5959
     
    6565      </varlistentry>
    6666
    67     </variablelist>
    68 
    6967    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    7068    href="../common/perl.xml"
    71     xpointer="xpointer(//*[@os='c'])"/>
     69    xpointer="xpointer(//*[@os='c1'])"/>
     70
     71    </variablelist>
    7272
    7373    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • final-system/multilib/procps-64bit.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of Procps</title>
    2323
    24     <para>Compile the package:</para>
     24    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     25    href="../common/procps.xml"
     26    xpointer="xpointer(//*[@os='a'])"/>
    2527
    26 <screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
     28<screen os="b"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
    2729
    28     <para>Install the package:</para>
     30    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     31    href="../common/procps.xml"
     32    xpointer="xpointer(//*[@os='c'])"/>
    2933
    30 <screen><userinput>make install lib64=lib64</userinput></screen>
     34<screen os="d"><userinput>make install lib64=lib64</userinput></screen>
    3135
    3236  </sect2>
  • final-system/multilib/procps-n32.xml

    rb8fddc7 re6423a01  
    2323    <title>Installation of Procps</title>
    2424
    25     <para>Compile the package:</para>
     25    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     26    href="../common/procps.xml"
     27    xpointer="xpointer(//*[@os='a'])"/>
    2628
    27 <screen><userinput>make CC="gcc ${BUILDN32}"</userinput></screen>
     29<screen os="b"><userinput>make CC="gcc ${BUILDN32}"</userinput></screen>
    2830
    29     <para>Install the package:</para>
     31    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     32    href="../common/procps.xml"
     33    xpointer="xpointer(//*[@os='a'])"/>
    3034
    31 <screen><userinput>make install lib64=lib32</userinput></screen>
     35<screen os="d"><userinput>make install lib64=lib32</userinput></screen>
    3236
    3337  </sect2>
  • final-system/multilib/procps.xml

    rb8fddc7 re6423a01  
    2323    <title>Installation of Procps</title>
    2424
    25     <para>Compile the package:</para>
     25    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     26    href="../common/procps.xml"
     27    xpointer="xpointer(//*[@os='a'])"/>
    2628
    27 <screen><userinput>make CC="gcc ${BUILD32}"</userinput></screen>
     29<screen os="b"><userinput>make CC="gcc ${BUILD32}"</userinput></screen>
    2830
    29     <para>Install the package:</para>
     31    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     32    href="../common/procps.xml"
     33    xpointer="xpointer(//*[@os='c'])"/>
    3034
    31 <screen><userinput>make install lib64=lib</userinput></screen>
     35    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     36    href="../common/procps.xml"
     37    xpointer="xpointer(//*[@os='d'])"/>
    3238
    3339  </sect2>
  • final-system/multilib/psmisc.xml

    rb8fddc7 re6423a01  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    2929   --exec-prefix=""</userinput></screen>
    30 
    31     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    32     href="../common/psmisc.xml"
    33     xpointer="xpointer(//*[@os='b'])"/>
    3430
    3531    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    6561    xpointer="xpointer(//*[@os='j'])"/>
    6662
     63    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     64    href="../common/psmisc.xml"
     65    xpointer="xpointer(//*[@os='k'])"/>
     66
    6767  </sect2>
    6868
  • final-system/multilib/readline-64bit.xml

    rb8fddc7 re6423a01  
    3434    xpointer="xpointer(//*[@os='c'])"/>
    3535
    36 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     36<screen os="d"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    3737   ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
    38 
    39     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    40     href="readline.xml"
    41     xpointer="xpointer(//*[@os='d'])"/>
    4238
    4339    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5753    xpointer="xpointer(//*[@os='i'])"/>
    5854
    59 <screen><userinput>chmod 755 /lib64/lib{readline,history}.so*</userinput></screen>
     55    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     56    href="readline.xml"
     57    xpointer="xpointer(//*[@os='j'])"/>
     58
     59<screen os="k"><userinput>chmod 755 /lib64/lib{readline,history}.so*</userinput></screen>
    6060
    6161    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6262    href="readline.xml"
    63     xpointer="xpointer(//*[@os='k'])"/>
     63    xpointer="xpointer(//*[@os='l'])"/>
    6464
    65 <screen><userinput>mv /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
     65<screen os="m"><userinput>mv /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
    6666
    67     <para>Next, remove the <filename class="extension">.so</filename>
     67    <para os="n">Next, remove the <filename class="extension">.so</filename>
    6868    files in <filename class="directory">/lib64</filename> and relink them into
    6969    <filename class="directory">/usr/lib64</filename>.</para>
    7070
    71 <screen><userinput>rm /lib64/lib{readline,history}.so
     71<screen os="o"><userinput>rm /lib64/lib{readline,history}.so
    7272ln -sf ../../lib64/libreadline.so.5 /usr/lib64/libreadline.so
    7373ln -sf ../../lib64/libhistory.so.5 /usr/lib64/libhistory.so</userinput></screen>
  • final-system/multilib/readline-n32.xml

    rb8fddc7 re6423a01  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37 <screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
     37<screen os="d"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    3838   ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="readline.xml"
    42     xpointer="xpointer(//*[@os='d'])"/>
    4339
    4440    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5854    xpointer="xpointer(//*[@os='i'])"/>
    5955
    60 <screen><userinput>chmod 755 /lib32/lib{readline,history}.so*</userinput></screen>
     56    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     57    href="readline.xml"
     58    xpointer="xpointer(//*[@os='j'])"/>
     59
     60<screen os="k"><userinput>chmod 755 /lib32/lib{readline,history}.so*</userinput></screen>
    6161
    6262    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6363    href="readline.xml"
    64     xpointer="xpointer(//*[@os='k'])"/>
     64    xpointer="xpointer(//*[@os='l'])"/>
    6565
    66 <screen><userinput>mv /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
     66<screen os="m"><userinput>mv /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
    6767
    68     <para>Next, remove the <filename class="extension">.so</filename>
     68    <para os="n">Next, remove the <filename class="extension">.so</filename>
    6969    files in <filename class="directory">/lib32</filename> and relink them into
    7070    <filename class="directory">/usr/lib32</filename>.</para>
    7171
    72 <screen><userinput>rm /lib32/lib{readline,history}.so
     72<screen os="o"><userinput>rm /lib32/lib{readline,history}.so
    7373ln -sf ../../lib32/libreadline.so.5 /usr/lib32/libreadline.so
    7474ln -sf ../../lib32/libhistory.so.5 /usr/lib32/libhistory.so</userinput></screen>
  • final-system/multilib/readline.xml

    rb8fddc7 re6423a01  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37 <screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
     37<screen os="d"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    3838   ./configure --prefix=/usr --libdir=/lib</userinput></screen>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="../common/readline.xml"
    42     xpointer="xpointer(//*[@os='d'])"/>
    4339
    4440    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    8278    xpointer="xpointer(//*[@os='n'])"/>
    8379
     80    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     81    href="../common/readline.xml"
     82    xpointer="xpointer(//*[@os='o'])"/>
     83
    8484  </sect2>
    8585
  • final-system/multilib/sed.xml

    rb8fddc7 re6423a01  
    3434    xpointer="xpointer(//*[@os='c'])"/>
    3535
    36 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     36<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    3737   --bindir=/bin</userinput></screen>
    3838
     
    5757    xpointer="xpointer(//*[@os='h'])"/>
    5858
     59    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     60    href="../common/sed.xml"
     61    xpointer="xpointer(//*[@os='i'])"/>
     62
    5963  </sect2>
    6064
  • final-system/multilib/shadow-64bit.xml

    rb8fddc7 re6423a01  
    3838    xpointer="xpointer(//*[@os='b'])"/>
    3939
    40 <screen><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
     40<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
    4141   --enable-shared</userinput></screen>
    4242
     
    109109    xpointer="xpointer(//*[@os='t'])"/>
    110110
    111 <screen><userinput>mv /lib64/libshadow.*a /usr/lib64
     111<screen os="u"><userinput>mv /lib64/libshadow.*a /usr/lib64
    112112rm /lib64/libshadow.so
    113113ln -sf ../../lib64/libshadow.so.0 /usr/lib64/libshadow.so</userinput></screen>
  • final-system/multilib/shadow-n32.xml

    rb8fddc7 re6423a01  
    3939    xpointer="xpointer(//*[@os='b'])"/>
    4040
    41 <screen><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
     41<screen os="c"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
    4242   --enable-shared</userinput></screen>
    4343
     
    7878    xpointer="xpointer(//*[@os='t'])"/>
    7979
    80 <screen><userinput>mv /lib32/libshadow.*a /usr/lib32
     80<screen os="u"><userinput>mv /lib32/libshadow.*a /usr/lib32
    8181rm /lib32/libshadow.so
    8282ln -sf ../../lib32/libshadow.so.0 /usr/lib32/libshadow.so</userinput></screen>
  • final-system/multilib/shadow.xml

    rb8fddc7 re6423a01  
    3939    xpointer="xpointer(//*[@os='b'])"/>
    4040
    41 <screen><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
     41<screen os="c"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
    4242   --enable-shared</userinput></screen>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    45     href="../common/shadow.xml"
    46     xpointer="xpointer(//*[@os='c'])"/>
    4743
    4844    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • final-system/multilib/sysklogd.xml

    rb8fddc7 re6423a01  
    3434    xpointer="xpointer(//*[@os='c'])"/>
    3535
    36 <screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
    37 
    38     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    39     href="../common/sysklogd.xml"
    40     xpointer="xpointer(//*[@os='d'])"/>
     36<screen os="d"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
    4137
    4238    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    4339    href="../common/sysklogd.xml"
    4440    xpointer="xpointer(//*[@os='e'])"/>
     41
     42    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     43    href="../common/sysklogd.xml"
     44    xpointer="xpointer(//*[@os='f'])"/>
    4545
    4646  </sect2>
  • final-system/multilib/tar.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../common/tar.xml"
    26     xpointer="xpointer(//*[@os='a'])"/>
     26    xpointer="xpointer(//*[@os='p1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="../common/tar.xml"
    30     xpointer="xpointer(//*[@os='a1'])"/>
     30    xpointer="xpointer(//*[@os='p2'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3333    href="../common/tar.xml"
    34     xpointer="xpointer(//*[@os='b'])"/>
     34    xpointer="xpointer(//*[@os='p3'])"/>
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3737    href="../common/tar.xml"
    38     xpointer="xpointer(//*[@os='b1'])"/>
     38    xpointer="xpointer(//*[@os='p4'])"/>
     39
     40    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     41    href="../common/tar.xml"
     42    xpointer="xpointer(//*[@os='a'])"/>
     43
     44<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     45   --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
    3946
    4047    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    4148    href="../common/tar.xml"
    4249    xpointer="xpointer(//*[@os='c'])"/>
    43 
    44 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    45    --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
    4650
    4751    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    6165    xpointer="xpointer(//*[@os='g'])"/>
    6266
    63     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    64     href="../common/tar.xml"
    65     xpointer="xpointer(//*[@os='h'])"/>
    66 
    6767  </sect2>
    6868
  • final-system/multilib/texinfo.xml

    rb8fddc7 re6423a01  
    3434    xpointer="xpointer(//*[@os='a'])"/>
    3535
    36 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    37 
    38     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    39     href="../common/texinfo.xml"
    40     xpointer="xpointer(//*[@os='b'])"/>
     36<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
    4137
    4238    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    7672    xpointer="xpointer(//*[@os='k'])"/>
    7773
     74    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     75    href="../common/texinfo.xml"
     76    xpointer="xpointer(//*[@os='l'])"/>
     77
    7878  </sect2>
    7979
  • final-system/multilib/udev.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../common/udev.xml"
     26    xpointer="xpointer(//*[@os='a'])"/>
     27
     28<screen os="b"><userinput>make CC="gcc ${BUILD64}" LD="gcc ${BUILD64}" \
     29    EXTRAS="extras/firmware extras/run_directory" udevdir=/dev</userinput></screen>
     30
     31    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     32    href="../common/udev.xml"
    2633    xpointer="xpointer(//*[@os='c'])"/>
    27 
    28 <screen><userinput>make CC="gcc ${BUILD64}" LD="gcc ${BUILD64}" \
    29     EXTRAS="extras/firmware extras/run_directory" udevdir=/dev</userinput></screen>
    3034
    3135    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    4751    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    4852    href="../common/udev.xml"
    49     xpointer="xpointer(//*[@os='g1'])"/>
    50 
    51     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    52     href="../common/udev.xml"
    5353    xpointer="xpointer(//*[@os='h'])"/>
    5454
     
    5959    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6060    href="../common/udev.xml"
    61     xpointer="xpointer(//*[@os='a'])"/>
    62 
    63     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    64     href="../common/udev.xml"
    65     xpointer="xpointer(//*[@os='b'])"/>
    66 
    67     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    68     href="../common/udev.xml"
    6961    xpointer="xpointer(//*[@os='j'])"/>
    7062
     
    7264    href="../common/udev.xml"
    7365    xpointer="xpointer(//*[@os='k'])"/>
     66
     67    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     68    href="../common/udev.xml"
     69    xpointer="xpointer(//*[@os='l'])"/>
     70
     71    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     72    href="../common/udev.xml"
     73    xpointer="xpointer(//*[@os='m'])"/>
    7474
    7575  </sect2>
  • final-system/multilib/util-linux.xml

    rb8fddc7 re6423a01  
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="../common/util-linux.xml"
    30     xpointer="xpointer(//*[@os='a'])"/>
     30    xpointer="xpointer(//*[@os='p1'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3333    href="../common/util-linux.xml"
    34     xpointer="xpointer(//*[@os='b'])"/>
     34    xpointer="xpointer(//*[@os='p2'])"/>
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3737    href="../common/util-linux.xml"
    38     xpointer="xpointer(//*[@os='b1'])"/>
     38    xpointer="xpointer(//*[@os='p3'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    4141    href="../common/util-linux.xml"
    42     xpointer="xpointer(//*[@os='b2'])"/>
     42    xpointer="xpointer(//*[@os='p4'])"/>
     43
     44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    href="../common/util-linux.xml"
     46    xpointer="xpointer(//*[@os='a'])"/>
     47
     48<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
    4349
    4450    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    4551    href="../common/util-linux.xml"
    4652    xpointer="xpointer(//*[@os='c'])"/>
    47 
    48 <screen><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
    4953
    5054    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    6872    xpointer="xpointer(//*[@os='h'])"/>
    6973
    70     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    71     href="../common/util-linux.xml"
    72     xpointer="xpointer(//*[@os='i'])"/>
    73 
    7474  </sect2>
    7575
  • final-system/multilib/vim.xml

    rb8fddc7 re6423a01  
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3333    href="../common/vim.xml"
     34    xpointer="xpointer(//*[@os='c'])"/>
     35
     36<screen os="d"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
     37   --enable-multibyte</userinput></screen>
     38
     39    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     40    href="../common/vim.xml"
    3441    xpointer="xpointer(//*[@os='e'])"/>
    35 
    36 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
    37    --enable-multibyte</userinput></screen>
    3842
    3943    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    6367    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6468    href="../common/vim.xml"
    65     xpointer="xpointer(//*[@os='k1'])"/>
    66 
    67     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    68     href="../common/vim.xml"
    6969    xpointer="xpointer(//*[@os='l'])"/>
    7070
  • final-system/multilib/zlib-64bit.xml

    rb8fddc7 re6423a01  
    3030    xpointer="xpointer(//*[@os='b'])"/>
    3131
    32 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
     32<screen os="c"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
    3333   --shared --libdir=/lib64</userinput></screen>
    34 
    35     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    36     href="zlib.xml"
    37     xpointer="xpointer(//*[@os='c'])"/>
    3834
    3935    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5349    xpointer="xpointer(//*[@os='g'])"/>
    5450
    55     <para>The previous command installed a <filename
     51    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     52    href="zlib.xml"
     53    xpointer="xpointer(//*[@os='h'])"/>
     54
     55    <para os="i">The previous command installed a <filename
    5656    class="extension">.so</filename> file in <filename
    5757    class="directory">/lib64</filename>. We will remove it and relink it into
    5858    <filename class="directory">/usr/lib64</filename>:</para>
    5959
    60 <screen><userinput>rm /lib64/libz.so
     60<screen os="j"><userinput>rm /lib64/libz.so
    6161ln -sf ../../lib64/libz.so.&zlib-version; /usr/lib64/libz.so</userinput></screen>
    62 
    63     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    64     href="zlib.xml"
    65     xpointer="xpointer(//*[@os='j'])"/>
    66 
    67 <screen><userinput>make clean
    68 CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure \
    69     --prefix=/usr --libdir=/usr/lib64
    70 make</userinput></screen>
    7162
    7263    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    7465    xpointer="xpointer(//*[@os='k'])"/>
    7566
    76     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    77     href="zlib.xml"
    78     xpointer="xpointer(//*[@os='l'])"/>
     67<screen os="l"><userinput>make clean
     68CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure \
     69    --prefix=/usr --libdir=/usr/lib64
     70make</userinput></screen>
    7971
    8072    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    8678    xpointer="xpointer(//*[@os='n'])"/>
    8779
    88 <screen><userinput>chmod 644 /usr/lib64/libz.a</userinput></screen>
     80    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     81    href="zlib.xml"
     82    xpointer="xpointer(//*[@os='o'])"/>
     83
     84    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     85    href="zlib.xml"
     86    xpointer="xpointer(//*[@os='p'])"/>
     87
     88<screen os="q"><userinput>chmod 644 /usr/lib64/libz.a</userinput></screen>
    8989
    9090  </sect2>
  • final-system/multilib/zlib-n32.xml

    rb8fddc7 re6423a01  
    3131    xpointer="xpointer(//*[@os='b'])"/>
    3232
    33 <screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure --prefix=/usr \
     33<screen os="c"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure --prefix=/usr \
    3434   --shared --libdir=/lib32</userinput></screen>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="zlib.xml"
    38     xpointer="xpointer(//*[@os='c'])"/>
    3935
    4036    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    5450    xpointer="xpointer(//*[@os='g'])"/>
    5551
    56     <para>The previous command installed a <filename
     52    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     53    href="zlib.xml"
     54    xpointer="xpointer(//*[@os='h'])"/>
     55
     56    <para os="i">The previous command installed a <filename
    5757    class="extension">.so</filename> file in <filename
    5858    class="directory">/lib32</filename>. We will remove it and relink it into
    5959    <filename class="directory">/usr/lib32</filename>:</para>
    6060
    61 <screen><userinput>rm /lib32/libz.so
     61<screen os="j"><userinput>rm /lib32/libz.so
    6262ln -sf ../../lib32/libz.so.&zlib-version; /usr/lib32/libz.so</userinput></screen>
    63 
    64     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    65     href="zlib.xml"
    66     xpointer="xpointer(//*[@os='j'])"/>
    67 
    68 <screen><userinput>make clean
    69 CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure \
    70     --prefix=/usr --libdir=/usr/lib32
    71 make</userinput></screen>
    7263
    7364    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    7566    xpointer="xpointer(//*[@os='k'])"/>
    7667
    77     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    78     href="zlib.xml"
    79     xpointer="xpointer(//*[@os='l'])"/>
     68<screen os="l"><userinput>make clean
     69CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure \
     70    --prefix=/usr --libdir=/usr/lib32
     71make</userinput></screen>
    8072
    8173    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    8779    xpointer="xpointer(//*[@os='n'])"/>
    8880
    89 <screen><userinput>chmod 644 /usr/lib32/libz.a</userinput></screen>
     81    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     82    href="zlib.xml"
     83    xpointer="xpointer(//*[@os='o'])"/>
     84
     85    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     86    href="zlib.xml"
     87    xpointer="xpointer(//*[@os='p'])"/>
     88
     89<screen os="q"><userinput>chmod 644 /usr/lib32/libz.a</userinput></screen>
    9090
    9191  </sect2>
  • final-system/multilib/zlib.xml

    rb8fddc7 re6423a01  
    3131    xpointer="xpointer(//*[@os='b'])"/>
    3232
    33 <screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure --prefix=/usr \
     33<screen os="c"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure --prefix=/usr \
    3434   --shared --libdir=/lib</userinput></screen>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../common/zlib.xml"
    38     xpointer="xpointer(//*[@os='c'])"/>
    3935
    4036    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    6662    xpointer="xpointer(//*[@os='j'])"/>
    6763
    68 <screen><userinput>make clean
    69 CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure --prefix=/usr
    70 make</userinput></screen>
    71 
    7264    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    7365    href="../common/zlib.xml"
    7466    xpointer="xpointer(//*[@os='k'])"/>
    7567
    76     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    77     href="../common/zlib.xml"
    78     xpointer="xpointer(//*[@os='l'])"/>
     68<screen os="l"><userinput>make clean
     69CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure --prefix=/usr
     70make</userinput></screen>
    7971
    8072    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    9082    xpointer="xpointer(//*[@os='o'])"/>
    9183
     84    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     85    href="../common/zlib.xml"
     86    xpointer="xpointer(//*[@os='p'])"/>
     87
     88    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     89    href="../common/zlib.xml"
     90    xpointer="xpointer(//*[@os='q'])"/>
     91
    9292  </sect2>
    9393
Note: See TracChangeset for help on using the changeset viewer.