Changeset e6423a01 for final-system


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
Files:
3 deleted
123 edited
1 moved

Legend:

Unmodified
Added
Removed

  • final-system/common/autoconf.xml

    rb8fddc7 re6423a01  
    3636    <para os="a">Prepare Autoconf for compilation:</para>
    3737
    38 <screen><userinput>./configure --prefix=/usr</userinput></screen>
     38<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
    3939
    40     <para os="b">Compile the package:</para>
     40    <para os="c">Compile the package:</para>
    4141
    42 <screen os="c"><userinput>make</userinput></screen>
     42<screen os="d"><userinput>make</userinput></screen>
    4343
    44     <para os="d">To test the results, issue:
     44    <para os="e">To test the results, issue:
    4545    <userinput>make check</userinput>.</para>
    4646
    47     <para os="e">Install the package:</para>
     47    <para os="f">Install the package:</para>
    4848
    49 <screen os="f"><userinput>make install</userinput></screen>
     49<screen os="g"><userinput>make install</userinput></screen>
    5050
    5151  </sect2>

  • final-system/common/automake.xml

    rb8fddc7 re6423a01  
    3737    <para os="a">Prepare Automake for compilation:</para>
    3838
    39 <screen><userinput>./configure --prefix=/usr</userinput></screen>
    40 
    41     <para os="b">Compile the package:</para>
    42 
    43 <screen os="c"><userinput>make</userinput></screen>
    44 
    45     <para os="d">To test the results, issue:
     39<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
     40
     41    <para os="c">Compile the package:</para>
     42
     43<screen os="d"><userinput>make</userinput></screen>
     44
     45    <para os="e">To test the results, issue:
    4646    <userinput>make check</userinput>.</para>
    4747
    48     <para os="e">Install the package:</para>
    49 
    50 <screen os="f"><userinput>make install</userinput></screen>
     48    <para os="f">Install the package:</para>
     49
     50<screen os="g"><userinput>make install</userinput></screen>
    5151
    5252  </sect2>

  • final-system/common/bash.xml

    rb8fddc7 re6423a01  
    5454    <para os="g">Prepare Bash for compilation:</para>
    5555
    56 <screen><userinput>./configure --prefix=/usr --bindir=/bin \
     56<screen os="h"><userinput>./configure --prefix=/usr --bindir=/bin \
    5757    --without-bash-malloc --with-installed-readline</userinput></screen>
    5858
    59     <variablelist os="h">
     59    <variablelist os="i">
    6060      <title>The meaning of the configure option:</title>
    6161
    … …  
    7171    </variablelist>
    7272
    73     <para os="i">Compile the package:</para>
     73    <para os="j">Compile the package:</para>
    7474
    75 <screen os="j"><userinput>make</userinput></screen>
     75<screen os="k"><userinput>make</userinput></screen>
    7676
    77     <para os="k">To test the results, issue:
     77    <para os="l">To test the results, issue:
    7878    <userinput>make tests</userinput>.</para>
    7979
    80     <para os="l">Install the package:</para>
     80    <para os="m">Install the package:</para>
    8181
    82 <screen os="m"><userinput>make install</userinput></screen>
     82<screen os="n"><userinput>make install</userinput></screen>
    8383
    84     <para os="n">Run the newly compiled <command>bash</command> program (replacing
     84    <para os="o">Run the newly compiled <command>bash</command> program (replacing
    8585    the one that is currently being executed):</para>
    8686
    87 <screen os="o"><userinput>exec /bin/bash --login +h</userinput></screen>
     87<screen os="p"><userinput>exec /bin/bash --login +h</userinput></screen>
    8888
    89     <note os="p">
     89    <note os="q">
    9090      <para>The parameters used make the <command>bash</command>
    9191      process an interactive login shell and continue to disable hashing so

  • final-system/common/bison.xml

    rb8fddc7 re6423a01  
    3434    <title>Installation of Bison</title>
    3535
    36     <para>Prepare Bison for compilation:</para>
     36    <para os="a">Prepare Bison for compilation:</para>
    3737
    38 <screen><userinput>./configure --prefix=/usr</userinput></screen>
     38<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
    3939
    40     <para>Compile the package:</para>
     40    <para os="c">Compile the package:</para>
    4141
    42 <screen><userinput>make</userinput></screen>
     42<screen os="d"><userinput>make</userinput></screen>
    4343
    44     <para>To test the results, issue:
     44    <para os="e">To test the results, issue:
    4545    <userinput>make check</userinput>.</para>
    4646
    47     <para>Install the package:</para>
     47    <para os="f">Install the package:</para>
    4848
    49 <screen><userinput>make install</userinput></screen>
     49<screen os="g"><userinput>make install</userinput></screen>
    5050
    5151  </sect2>

  • final-system/common/bzip2.xml

    rb8fddc7 re6423a01  
    3636    <title>Installation of Bzip2</title>
    3737
    38     <para os="j">Apply a patch to install the documentation for this
     38    <para os="p1">Apply a patch to install the documentation for this
    3939    package:</para>
    4040
    41 <screen os="k"><userinput>patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen>
    42 
    43     <para os="l">The <command>bzgrep</command> command does not escape '|' and
     41<screen os="p2"><userinput>patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen>
     42
     43    <para os="p3">The <command>bzgrep</command> command does not escape '|' and
    4444    '&amp;' in filenames passed to it. This allows arbitrary commands to be
    4545    executed with the privileges of the user running <command>bzgrep</command>.
    4646    Apply the following patch to address this:</para>
    4747
    48 <screen os="m"><userinput>patch -Np1 -i ../&bzip2-bzgrep-patch;</userinput></screen>
     48<screen os="p4"><userinput>patch -Np1 -i ../&bzip2-bzgrep-patch;</userinput></screen>
    4949
    5050    <para os="a">The Bzip2 package does not contain a <command>configure</command>
    5151    script. Compile it with:</para>
    5252
    53 <screen><userinput>make -f Makefile-libbz2_so
     53<screen os="b"><userinput>make -f Makefile-libbz2_so
    5454make clean</userinput></screen>
    5555
    56     <para os="b">The <parameter>-f</parameter> flag will cause Bzip2 to be built
     56    <para os="c">The <parameter>-f</parameter> flag will cause Bzip2 to be built
    5757    using a different <filename>Makefile</filename> file, in this case the
    5858    <filename>Makefile-libbz2_so</filename> file, which creates a dynamic
    … …  
    6060    Bzip2 utilities against it.</para>
    6161
    62     <para os="c">Compile and test the package:</para>
    63 
    64 <screen><userinput>make</userinput></screen>
    65 
    66     <para os="e">If reinstalling Bzip2, perform
     62    <para os="d">Compile and test the package:</para>
     63
     64<screen os="e"><userinput>make</userinput></screen>
     65
     66    <para os="f">If reinstalling Bzip2, perform
    6767    <userinput>rm -f /usr/bin/bz*</userinput> first, otherwise the
    6868    following <command>make install</command> will fail.</para>
    6969
    70     <para os="f">Install the programs:</para>
    71 
    72 <screen os="g"><userinput>make install</userinput></screen>
    73 
    74     <para os="h">Install the shared <command>bzip2</command> binary into the
     70    <para os="g">Install the programs:</para>
     71
     72<screen os="h"><userinput>make install</userinput></screen>
     73
     74    <para os="i">Install the shared <command>bzip2</command> binary into the
    7575    <filename class="directory">/bin</filename> directory, make
    7676    some necessary symbolic links, and clean up:</para>
    7777
    78 <screen os="i"><userinput>cp bzip2-shared /bin/bzip2
     78<screen os="j"><userinput>cp bzip2-shared /bin/bzip2
    7979cp -a libbz2.so* /lib
    8080ln -s ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so

  • final-system/common/diffutils.xml

    rb8fddc7 re6423a01  
    3535    <title>Installation of Diffutils</title>
    3636
    37     <para>Prepare Diffutils for compilation:</para>
     37    <para os="a">Prepare Diffutils for compilation:</para>
    3838
    39 <screen><userinput>./configure --prefix=/usr</userinput></screen>
     39<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
    4040
    41     <para>Compile the package:</para>
     41    <para os="c">Compile the package:</para>
    4242
    43 <screen><userinput>make</userinput></screen>
     43<screen os="d"><userinput>make</userinput></screen>
    4444
    45     <para>This package does not come with a test suite.</para>
     45    <para os="e">This package does not come with a test suite.</para>
    4646
    47     <para>Install the package:</para>
     47    <para os="f">Install the package:</para>
    4848
    49 <screen><userinput>make install</userinput></screen>
     49<screen os="g"><userinput>make install</userinput></screen>
    5050
    5151  </sect2>

  • final-system/common/e2fsprogs.xml

    rb8fddc7 re6423a01  
    4545    <para os="c">Prepare E2fsprogs for compilation:</para>
    4646
    47 <screen><userinput>../configure --prefix=/usr --with-root-prefix="" \
     47<screen os="d"><userinput>../configure --prefix=/usr --with-root-prefix="" \
    4848    --enable-elf-shlibs --disable-evms</userinput></screen>
    4949
    50     <variablelist os="d">
     50    <variablelist os="e">
    5151      <title>The meaning of the configure options:</title>
    5252
    53       <varlistentry>
     53      <varlistentry os="e1">
    5454        <term><parameter>--with-root-prefix=""</parameter></term>
    5555        <listitem>
    … …  
    6565      </varlistentry>
    6666
    67       <varlistentry os="l">
     67      <varlistentry os="e2">
    6868        <term><parameter>--enable-elf-shlibs</parameter></term>
    6969        <listitem>
    … …  
    7373      </varlistentry>
    7474
    75       <varlistentry os="m">
     75      <varlistentry os="e3">
    7676        <term><parameter>--disable-evms</parameter></term>
    7777        <listitem>
    … …  
    8484        </listitem>
    8585      </varlistentry>
     86
    8687    </variablelist>
    8788
    88     <para os="e">Compile the package:</para>
    89 
    90 <screen os="f"><userinput>make</userinput></screen>
    91 
    92     <para os="g">To test the results, issue:
     89    <para os="f">Compile the package:</para>
     90
     91<screen os="g"><userinput>make</userinput></screen>
     92
     93    <para os="h">To test the results, issue:
    9394    <userinput>make check</userinput>.</para>
    9495
    95     <para os="h">Install the binaries and documentation:</para>
    96 
    97 <screen os="i"><userinput>make install</userinput></screen>
    98 
    99     <para os="j">Install the shared libraries:</para>
    100 
    101 <screen os="k"><userinput>make install-libs</userinput></screen>
     96    <para os="i">Install the binaries and documentation:</para>
     97
     98<screen os="j"><userinput>make install</userinput></screen>
     99
     100    <para os="k">Install the shared libraries:</para>
     101
     102<screen os="l"><userinput>make install-libs</userinput></screen>
    102103
    103104  </sect2>

  • final-system/common/findutils.xml

    rb8fddc7 re6423a01  
    3939    <para os="a">Prepare Findutils for compilation:</para>
    4040
    41 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \
     41<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \
    4242    --localstatedir=/var/lib/locate</userinput></screen>
    4343
    44     <variablelist os="b">
     44    <variablelist os="c">
    4545      <title>The meaning of the configure options:</title>
    4646
    … …  
    5656    </variablelist>
    5757
    58     <para os="c">Compile the package:</para>
     58    <para os="d">Compile the package:</para>
    5959
    60 <screen os="d"><userinput>make</userinput></screen>
     60<screen os="e"><userinput>make</userinput></screen>
    6161
    62     <para os="e">To test the results, issue:
     62    <para os="f">To test the results, issue:
    6363    <userinput>make check</userinput>.</para>
    6464
    65     <para os="f">Install the package:</para>
     65    <para os="g">Install the package:</para>
    6666
    67 <screen os="g"><userinput>make install</userinput></screen>
     67<screen os="h"><userinput>make install</userinput></screen>
    6868
    6969  </sect2>

  • final-system/common/flex.xml

    rb8fddc7 re6423a01  
    4949    <para os="e">Prepare Flex for compilation:</para>
    5050
    51 <screen><userinput>./configure --prefix=/usr</userinput></screen>
     51<screen os="f"><userinput>./configure --prefix=/usr</userinput></screen>
    5252
    53     <para os="f">Compile the package:</para>
     53    <para os="g">Compile the package:</para>
    5454
    55 <screen os="g"><userinput>make</userinput></screen>
     55<screen os="h"><userinput>make</userinput></screen>
    5656
    57     <para os="h">To test the results, issue:
     57    <para os="i">To test the results, issue:
    5858    <userinput>make check</userinput>.</para>
    5959
    60     <para os="i">Install the package:</para>
     60    <para os="j">Install the package:</para>
    6161
    62 <screen os="j"><userinput>make install</userinput></screen>
     62<screen os="k"><userinput>make install</userinput></screen>
    6363
    64     <para os="k">There are some packages that expect to find the
     64    <para os="l">There are some packages that expect to find the
    6565    <filename class="libraryfile">lex</filename> library in <filename
    6666    class="directory">/usr/lib</filename>. Create a symlink to account for
    6767    this:</para>
    6868
    69 <screen os="l"><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>
     69<screen os="m"><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>
    7070
    71     <para os="m">A few programs do not know about <command>flex</command> yet and
     71    <para os="n">A few programs do not know about <command>flex</command> yet and
    7272    try to run its predecessor, <command>lex</command>. To support those
    7373    programs, create a wrapper script named <filename>lex</filename> that
    … …  
    7575    mode:</para>
    7676
    77 <screen os="n"><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"
     77<screen os="o"><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"
    7878<literal>#!/bin/sh
    7979# Begin /usr/bin/lex

  • final-system/common/gettext.xml

    rb8fddc7 re6423a01  
    3737    <title>Installation of Gettext</title>
    3838
    39     <para>Prepare Gettext for compilation:</para>
    40 
    41 <screen><userinput>./configure --prefix=/usr</userinput></screen>
    42 
    43     <para>Compile the package:</para>
    44 
    45 <screen><userinput>make</userinput></screen>
    46 
    47     <para>To test the results, issue: <userinput>make check</userinput>.</para>
    48 
    49     <para>Install the package:</para>
    50 
    51 <screen><userinput>make install</userinput></screen>
     39    <para os="a">Prepare Gettext for compilation:</para>
     40
     41<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
     42
     43    <para os="c">Compile the package:</para>
     44
     45<screen os="d"><userinput>make</userinput></screen>
     46
     47    <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
     48
     49    <para os="f">Install the package:</para>
     50
     51<screen os="g"><userinput>make install</userinput></screen>
    5252
    5353  </sect2>

  • final-system/common/groff.xml

    rb8fddc7 re6423a01  
    4242    <para os="b">Prepare Groff for compilation:</para>
    4343
    44 <screen><userinput>PAGE=<replaceable>[paper_size]</replaceable> ./configure --prefix=/usr</userinput></screen>
    45 
    46     <para os="c">Compile the package:</para>
    47 
    48 <screen os="d"><userinput>make</userinput></screen>
    49 
    50     <para os="e">Install the package:</para>
    51 
    52 <screen os="f"><userinput>make install</userinput></screen>
    53 
    54     <para os="g">Some documentation programs, such as <command>xman</command>,
     44<screen os="c"><userinput>PAGE=<replaceable>[paper_size]</replaceable> ./configure --prefix=/usr</userinput></screen>
     45
     46    <para os="d">Compile the package:</para>
     47
     48<screen os="e"><userinput>make</userinput></screen>
     49
     50    <para os="f">Install the package:</para>
     51
     52<screen os="g"><userinput>make install</userinput></screen>
     53
     54    <para os="h">Some documentation programs, such as <command>xman</command>,
    5555    will not work properly without the following symlinks:</para>
    5656
    57 <screen os="h"><userinput>ln -s soelim /usr/bin/zsoelim
     57<screen os="i"><userinput>ln -s soelim /usr/bin/zsoelim
    5858ln -s eqn /usr/bin/geqn
    5959ln -s tbl /usr/bin/gtbl</userinput></screen>

  • final-system/common/gzip.xml

    rb8fddc7 re6423a01  
    3535    <title>Installation of Gzip</title>
    3636
    37     <para os="a">The following patch fixes two security vulnerabilities in Gzip.
     37    <para os="p1">The following patch fixes two security vulnerabilities in Gzip.
    3838    First, a path traversal bug when using the <option>-N</option> option
    3939    (CAN-2005-1228) Second, a race condition in the file permission restore
    4040    code (CAN-2005-0998)</para>
    4141
    42 <screen os="b"><userinput>patch -Np1 -i ../&gzip-security_fix-patch;</userinput></screen>
    43 
    44     <para os="c">Prepare Gzip for compilation:</para>
    45 
    46 <screen><userinput>./configure --prefix=/usr</userinput></screen>
    47 
    48     <para os="d">The <command>gzexe</command> script has the location of the
     42<screen os="p2"><userinput>patch -Np1 -i ../&gzip-security_fix-patch;</userinput></screen>
     43
     44    <para os="a">Prepare Gzip for compilation:</para>
     45
     46<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
     47
     48    <para os="c">The <command>gzexe</command> script has the location of the
    4949    <command>gzip</command> binary hard-wired into it. Because the
    5050    location of the binary is changed later, the following command ensures
    5151    that the new location gets placed into the script:</para>
    5252
    53 <screen os="e"><userinput>sed -i 's@"BINDIR"@/bin@g' gzexe.in</userinput></screen>
    54 
    55     <para os="f">Compile the package:</para>
    56 
    57 <screen os="g"><userinput>make</userinput></screen>
    58 
    59     <para os="h">Install the package:</para>
    60 
    61 <screen os="i"><userinput>make install</userinput></screen>
    62 
    63     <para os="j">Move the <command>gzip</command> program to the <filename
     53<screen os="d"><userinput>sed -i 's@"BINDIR"@/bin@g' gzexe.in</userinput></screen>
     54
     55    <para os="e">Compile the package:</para>
     56
     57<screen os="f"><userinput>make</userinput></screen>
     58
     59    <para os="g">Install the package:</para>
     60
     61<screen os="h"><userinput>make install</userinput></screen>
     62
     63    <para os="i">Move the <command>gzip</command> program to the <filename
    6464    class="directory">/bin</filename> directory and create some commonly
    6565    used symlinks to it:</para>
    6666
    67 <screen os="k"><userinput>mv /usr/bin/gzip /bin
     67<screen os="j"><userinput>mv /usr/bin/gzip /bin
    6868rm /usr/bin/{gunzip,zcat}
    6969ln -s gzip /bin/gunzip

  • final-system/common/hotplug.xml

    rb8fddc7 re6423a01  
    3838    <title>Installation of Hotplug</title>
    3939
    40     <para>Install the Hotplug package:</para>
    41 
    42 <screen><userinput>make install</userinput></screen>
    43 
    44     <para>Remove the init script that Hotplug installs since we are going
     40    <para os="a">Install the Hotplug package:</para>
     41
     42<screen os="b"><userinput>make install</userinput></screen>
     43
     44    <para os="c">Remove the init script that Hotplug installs since we are going
    4545    to be using the script included in the LFS-Bootscripts package:</para>
    4646
    47 <screen><userinput>rm -rf /etc/init.d</userinput></screen>
    48 
    49     <para>Network device hotplugging is not yet supported by the
     47<screen os="d"><userinput>rm -rf /etc/init.d</userinput></screen>
     48
     49    <para os="e">Network device hotplugging is not yet supported by the
    5050    LFS-Bootscripts package. For that reason, remove the network
    5151    hotplug agent:</para>
    5252
    53 <screen><userinput>rm -f /etc/hotplug/net.agent</userinput></screen>
    54 
    55     <para>Create a directory for storing firmware that can be loaded by
     53<screen os="f"><userinput>rm -f /etc/hotplug/net.agent</userinput></screen>
     54
     55    <para os="g">Create a directory for storing firmware that can be loaded by
    5656    <command>hotplug</command>:</para>
    5757
    58 <screen><userinput>mkdir /lib/firmware</userinput></screen>
     58<screen os="h"><userinput>mkdir /lib/firmware</userinput></screen>
    5959
    6060  </sect2>

  • final-system/common/iana-etc.xml

    rb8fddc7 re6423a01  
    3434    <title>Installation of Iana-Etc</title>
    3535
    36     <para>The following command converts the raw data provided by IANA into
     36    <para os="a">The following command converts the raw data provided by IANA into
    3737    the correct formats for the <filename>/etc/protocols</filename> and
    3838    <filename>/etc/services</filename> data files:</para>
    3939
    40 <screen><userinput>make</userinput></screen>
     40<screen os="b"><userinput>make</userinput></screen>
    4141
    42     <para>Install the package:</para>
     42    <para os="c">Install the package:</para>
    4343
    44 <screen><userinput>make install</userinput></screen>
     44<screen os="d"><userinput>make install</userinput></screen>
    4545
    4646  </sect2>

  • final-system/common/inetutils.xml

    rb8fddc7 re6423a01  
    3434    <title>Installation of Inetutils</title>
    3535
    36     <para os="a">All programs that come with Inetutils will not be installed.
     36    <para os="p1">All programs that come with Inetutils will not be installed.
    3737    However, the Inetutils build system will insist on installing all the
    3838    man pages anyway. The following patch will correct this
    3939    situation:</para>
    4040
    41 <screen os="b"><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen>
    42 
    43     <para os="b1">The following patches addresses build issues with GCC 4.x:</para>
    44 
    45 <screen os="b2"><userinput>patch -Np1 -i ../&inetutils-gcc4_fixes-patch;</userinput></screen>
    46 
    47     <para os="c">Prepare Inetutils for compilation:</para>
    48 
    49 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
     41<screen os="p2"><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen>
     42
     43    <para os="p3">The following patches addresses build issues with GCC 4.x:</para>
     44
     45<screen os="p4"><userinput>patch -Np1 -i ../&inetutils-gcc4_fixes-patch;</userinput></screen>
     46
     47    <para os="a">Prepare Inetutils for compilation:</para>
     48
     49<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
    5050    --sysconfdir=/etc --localstatedir=/var \
    5151    --disable-logger --disable-syslogd \
    5252    --disable-whois --disable-servers</userinput></screen>
    5353
    54     <variablelist os="d">
     54    <variablelist os="c">
    5555      <title>The meaning of the configure options:</title>
    5656
    … …  
    9898    </variablelist>
    9999
    100     <para os="e">Compile the package:</para>
    101 
    102 <screen os="f"><userinput>make</userinput></screen>
    103 
    104     <para os="g">Install the package:</para>
    105 
    106 <screen os="h"><userinput>make install</userinput></screen>
    107 
    108     <para os="i">Move the <command>ping</command> program to its FHS-compliant
     100    <para os="d">Compile the package:</para>
     101
     102<screen os="e"><userinput>make</userinput></screen>
     103
     104    <para os="f">Install the package:</para>
     105
     106<screen os="g"><userinput>make install</userinput></screen>
     107
     108    <para os="h">Move the <command>ping</command> program to its FHS-compliant
    109109    place:</para>
    110110
    111 <screen os="j"><userinput>mv /usr/bin/ping /bin</userinput></screen>
     111<screen os="i"><userinput>mv /usr/bin/ping /bin</userinput></screen>
    112112
    113113  </sect2>

  • final-system/common/iproute2.xml

    rb8fddc7 re6423a01  
    3434    <title>Installation of IPRoute2</title>
    3535
    36     <para os="a">The <command>arpd</command> binary included in this package is
     36    <para os="s1">The <command>arpd</command> binary included in this package is
    3737    dependent on Berkeley DB.  Because <command>arpd</command> is not a
    3838    very common requirement on a base Linux system, remove the dependency
    … …  
    4242    url="&blfs-root;view/svn/server/databases.html#db"/>.</para>
    4343
    44 <screen os="b"><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile</userinput></screen>
    45 
    46     <para os="c">Prepare IPRoute2 for compilation:</para>
    47 
    48 <screen os="d"><userinput>sh configure </userinput></screen>
    49 
    50     <para os="e">Compile the package:</para>
    51 
    52 <screen><userinput>make SBINDIR=/sbin</userinput></screen>
    53 
    54     <variablelist os="f">
     44<screen os="s2"><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile</userinput></screen>
     45
     46    <para os="a">Prepare IPRoute2 for compilation:</para>
     47
     48<screen os="b"><userinput>sh configure </userinput></screen>
     49
     50    <para os="c">Compile the package:</para>
     51
     52<screen os="d"><userinput>make SBINDIR=/sbin</userinput></screen>
     53
     54    <variablelist os="e">
    5555      <title>The meaning of the make option:</title>
    5656
    … …  
    6666    </variablelist>
    6767
    68     <para os="g">Install the package:</para>
    69 
    70 <screen os="h"><userinput>make SBINDIR=/sbin install</userinput></screen>
     68    <para os="f">Install the package:</para>
     69
     70<screen os="g"><userinput>make SBINDIR=/sbin install</userinput></screen>
    7171
    7272  </sect2>

  • final-system/common/kbd.xml

    rb8fddc7 re6423a01  
    3535    <title>Installation of Kbd</title>
    3636
    37     <para os="a1">The following patch fixes build issues with GCC 4.x:</para>
    38 
    39 <screen os="a2"><userinput>patch -Np1 -i ../&kbd-gcc4_fixes-patch;</userinput></screen>
    40 
    41     <para>Prepare Kbd for compilation:</para>
    42 
    43 <screen><userinput>./configure</userinput></screen>
    44 
    45     <para>Compile the package:</para>
    46 
    47 <screen><userinput>make</userinput></screen>
    48 
    49     <para>Install the package:</para>
    50 
    51 <screen><userinput>make install</userinput></screen>
     37    <para os="p1">The following patch fixes build issues with GCC 4.x:</para>
     38
     39<screen os="p2"><userinput>patch -Np1 -i ../&kbd-gcc4_fixes-patch;</userinput></screen>
     40
     41    <para os="a">Prepare Kbd for compilation:</para>
     42
     43<screen os="b"><userinput>./configure</userinput></screen>
     44
     45    <para os="c">Compile the package:</para>
     46
     47<screen os="d"><userinput>make</userinput></screen>
     48
     49    <para os="e">Install the package:</para>
     50
     51<screen os="f"><userinput>make install</userinput></screen>
    5252
    5353  </sect2>

  • final-system/common/less.xml

    rb8fddc7 re6423a01  
    3636    <para os="a">Prepare Less for compilation:</para>
    3737
    38 <screen><userinput>./configure --prefix=/usr --sysconfdir=/etc</userinput></screen>
     38<screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc</userinput></screen>
    3939
    40     <variablelist os="b">
     40    <variablelist os="c">
    4141      <title>The meaning of the configure option:</title>
    4242
    … …  
    5151    </variablelist>
    5252
    53     <para os="c">Compile the package:</para>
     53    <para os="d">Compile the package:</para>
    5454
    55 <screen os="d"><userinput>make</userinput></screen>
     55<screen os="e"><userinput>make</userinput></screen>
    5656
    57     <para os="e">Install the package:</para>
     57    <para os="f">Install the package:</para>
    5858
    59 <screen os="f"><userinput>make install</userinput></screen>
     59<screen os="g"><userinput>make install</userinput></screen>
    6060
    61     <para os="g">Move less to /bin:</para>
     61    <para os="h">Move less to /bin:</para>
    6262
    63 <screen os="h"><userinput>mv /usr/bin/less /bin</userinput></screen>
     63<screen os="i"><userinput>mv /usr/bin/less /bin</userinput></screen>
    6464
    6565  </sect2>

  • final-system/common/libtool.xml

    rb8fddc7 re6423a01  
    3838    <para os="a">Prepare Libtool for compilation:</para>
    3939
    40 <screen><userinput>./configure --prefix=/usr</userinput></screen>
     40<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
    4141
    42     <para os="b">Compile the package:</para>
     42    <para os="c">Compile the package:</para>
    4343
    44 <screen os="c"><userinput>make</userinput></screen>
     44<screen os="d"><userinput>make</userinput></screen>
    4545
    46     <para os="d">To test the results, issue:
     46    <para os="e">To test the results, issue:
    4747    <userinput>make check</userinput>.</para>
    4848
    49     <para os="e">Install the package:</para>
     49    <para os="f">Install the package:</para>
    5050
    51 <screen os="f"><userinput>make install</userinput></screen>
     51<screen os="g"><userinput>make install</userinput></screen>
    5252
    53     <para os="g">Correct the ownership of the <filename
     53    <para os="h">Correct the ownership of the <filename
    5454    class="libraryfile">libltdl</filename> data files:</para>
    5555
    56 <screen os="h"><userinput>chown -R root:root /usr/share/libtool/libltdl</userinput></screen>
     56<screen os="i"><userinput>chown -R root:root /usr/share/libtool/libltdl</userinput></screen>
    5757
    5858  </sect2>

  • final-system/common/m4.xml

    rb8fddc7 re6423a01  
    3434    <title>Installation of M4</title>
    3535
    36     <para>Prepare M4 for compilation:</para>
     36    <para os="a">Prepare M4 for compilation:</para>
    3737
    38 <screen><userinput>./configure --prefix=/usr</userinput></screen>
     38<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
    3939
    40     <para>Compile the package:</para>
     40    <para os="c">Compile the package:</para>
    4141
    42 <screen><userinput>make</userinput></screen>
     42<screen os="d"><userinput>make</userinput></screen>
    4343
    44     <para>To test the results, issue:
     44    <para os="e">To test the results, issue:
    4545    <userinput>make check</userinput>.</para>
    4646
    47     <para>Install the package:</para>
     47    <para os="f">Install the package:</para>
    4848
    49 <screen><userinput>make install</userinput></screen>
     49<screen os="g"><userinput>make install</userinput></screen>
    5050
    5151  </sect2>

  • final-system/common/man-pages.xml

    rb8fddc7 re6423a01  
    3333    <title>Installation of Man-pages</title>
    3434
    35     <para>Install Man-pages by running:</para>
     35    <para os="a">Install Man-pages by running:</para>
    3636
    37 <screen><userinput>make install</userinput></screen>
     37<screen os="b"><userinput>make install</userinput></screen>
    3838
    3939  </sect2>

  • final-system/common/man.xml

    rb8fddc7 re6423a01  
    5252    <para os="f">Prepare Man for compilation:</para>
    5353
    54 <screen><userinput>./configure -confdir=/etc</userinput></screen>
    55 
    56     <variablelist os="g">
     54<screen os="g"><userinput>./configure -confdir=/etc</userinput></screen>
     55
     56    <variablelist os="h">
    5757      <title>The meaning of the configure options:</title>
    5858
    … …  
    6767    </variablelist>
    6868
    69     <para os="h">Compile the package:</para>
    70 
    71 <screen os="i"><userinput>make</userinput></screen>
    72 
    73     <para os="j">Install the package:</para>
    74 
    75 <screen os="k"><userinput>make install</userinput></screen>
    76 
    77     <note os="l">
     69    <para os="i">Compile the package:</para>
     70
     71<screen os="j"><userinput>make</userinput></screen>
     72
     73    <para os="k">Install the package:</para>
     74
     75<screen os="l"><userinput>make install</userinput></screen>
     76
     77    <note os="m">
    7878      <para>If you will be working on a terminal that does not support
    7979      text attributes such as color and bold, you can disable Select
    … …  
    8686    </note>
    8787
    88     <para os="m">If the character set of the locale uses 8-bit characters, search
     88    <para os="n">If the character set of the locale uses 8-bit characters, search
    8989    for the line beginning with <quote>NROFF</quote> in
    9090    <filename>/etc/man.conf</filename>, and verify that it matches the
    9191    following:</para>
    9292
    93 <screen os="n">NROFF /usr/bin/nroff -Tlatin1 -mandoc</screen>
    94 
    95     <para os="o">Note that <quote>latin1</quote> should be used even if it is not
     93<screen os="o">NROFF /usr/bin/nroff -Tlatin1 -mandoc</screen>
     94
     95    <para os="p">Note that <quote>latin1</quote> should be used even if it is not
    9696    the character set of the locale. The reason is that, according to the
    9797    specification, <command>groff</command> has no means of typesetting
    … …  
    105105    it is usable as the input for a pager.</para>
    106106
    107     <para os="p">This does not solve the problem of a non-working
     107    <para os="q">This does not solve the problem of a non-working
    108108    <command>man2dvi</command> program for localized man pages in
    109109    non-ISO 8859-1 locales. Also, it does not work with multibyte
    … …  
    112112    not support multibyte character sets.</para>
    113113
    114     <para os="q">Additional information with regards to the compression of
     114    <para os="r">Additional information with regards to the compression of
    115115    man and info pages can be found in the BLFS book at
    116116    <ulink url="&blfs-root;view/cvs/postlfs/compressdoc.html"/>.</para>

  • final-system/common/mktemp.xml

    rb8fddc7 re6423a01  
    4242    <para os="c">Prepare Mktemp for compilation:</para>
    4343
    44 <screen os="c1"><userinput>./configure --prefix=/usr --with-libc</userinput></screen>
     44<screen os="d"><userinput>./configure --prefix=/usr --with-libc</userinput></screen>
    4545
    46     <variablelist os="d">
     46    <variablelist os="e">
    4747      <title>The meaning of the configure option:</title>
    4848
    … …  
    5757    </variablelist>
    5858
    59     <para os="e">Compile the package:</para>
     59    <para os="f">Compile the package:</para>
    6060
    61 <screen os="f"><userinput>make</userinput></screen>
     61<screen os="g"><userinput>make</userinput></screen>
    6262
    63     <para os="g">Install the package:</para>
     63    <para os="h">Install the package:</para>
    6464
    65 <screen os="h"><userinput>make install
     65<screen os="i"><userinput>make install
    6666make install-tempfile</userinput></screen>
    6767

  • final-system/common/module-init-tools.xml

    rb8fddc7 re6423a01  
    4343<screen os="b"><userinput>touch modprobe.conf.5</userinput></screen>
    4444
    45     <para os="g">If you wish to run the test suite for Module-Init-Tools, you
     45    <para os="c">If you wish to run the test suite for Module-Init-Tools, you
    4646    will need to download the separate testsuite tarball. Issue the
    4747    following commands to perform the tests (note that the
    … …  
    5050    process):</para>
    5151
    52 <screen os="g1"><userinput>tar -xvf ../module-init-tools-testsuite-&module-init-tools-version;.tar.bz2 --strip-path=1 &amp;&amp;
     52<screen os="d"><userinput>tar -xvf ../module-init-tools-testsuite-&module-init-tools-version;.tar.bz2 --strip-path=1 &amp;&amp;
    5353./configure &amp;&amp;
    5454make check &amp;&amp;
    5555make distclean</userinput></screen>
    5656
    57     <para os="c">Prepare Module-Init-Tools for compilation:</para>
     57    <para os="e">Prepare Module-Init-Tools for compilation:</para>
    5858
    59 <screen os="c1"><userinput>./configure --prefix=/ --enable-zlib</userinput></screen>
     59<screen os="f"><userinput>./configure --prefix=/ --enable-zlib</userinput></screen>
    6060
    61     <variablelist os="d">
     61    <variablelist os="g">
    6262      <title>The meaning of the configure options:</title>
    6363
    … …  
    7272    </variablelist>
    7373
    74     <para os="e">Compile the package:</para>
     74    <para os="h">Compile the package:</para>
    7575
    76 <screen os="f"><userinput>make</userinput></screen>
     76<screen os="i"><userinput>make</userinput></screen>
    7777
    78     <para os="h">Install the package:</para>
     78    <para os="j">Install the package:</para>
    7979
    80 <screen os="i"><userinput>make install</userinput></screen>
     80<screen os="k"><userinput>make install</userinput></screen>
    8181
    8282  </sect2>

  • final-system/common/ncurses.xml

    rb8fddc7 re6423a01  
    3737    <para os="a">Prepare Ncurses for compilation:</para>
    3838
    39 <screen><userinput>./configure --prefix=/usr --libdir=/lib \
     39<screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib \
    4040    --with-shared --without-debug</userinput></screen>
    4141
    42     <para os="b">Compile the package:</para>
    43 
    44 <screen os="c"><userinput>make</userinput></screen>
    45 
    46     <para os="d">This package does not come with a test suite.</para>
    47 
    48     <para os="e">Install the package:</para>
    49 
    50 <screen os="f"><userinput>make install</userinput></screen>
    51 
    52     <para os="g">Move the Ncurses static libraries to the proper locations:</para>
    53 
    54 <screen os="h"><userinput>mv /lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib</userinput></screen>
    55 
    56     <para os="i">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
    57 
    58 <screen os="j"><userinput>rm /lib/lib{ncurses,menu,panel,form,curses}.so
     42    <para os="c">Compile the package:</para>
     43
     44<screen os="d"><userinput>make</userinput></screen>
     45
     46    <para os="e">This package does not come with a test suite.</para>
     47
     48    <para os="f">Install the package:</para>
     49
     50<screen os="g"><userinput>make install</userinput></screen>
     51
     52    <para os="h">Move the Ncurses static libraries to the proper locations:</para>
     53
     54<screen os="i"><userinput>mv /lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib</userinput></screen>
     55
     56    <para os="j">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
     57
     58<screen os="k"><userinput>rm /lib/lib{ncurses,menu,panel,form,curses}.so
    5959ln -sf ../../lib/libncurses.so.5 /usr/lib/libcurses.so
    6060ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
    … …  
    6363ln -sf ../../lib/libform.so.5 /usr/lib/libform.so</userinput></screen>
    6464
    65     <para os="k">Give the Ncurses libraries execute permissions:</para>
    66 
    67 <screen os="l"><userinput>chmod 755 /lib/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
     65    <para os="l">Give the Ncurses libraries execute permissions:</para>
     66
     67<screen os="m"><userinput>chmod 755 /lib/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
    6868
    6969  </sect2>

  • final-system/common/patch.xml

    rb8fddc7 re6423a01  
    3636    <title>Installation of Patch</title>
    3737
    38     <para>Prepare Patch for compilation:</para>
     38    <para os="a">Prepare Patch for compilation:</para>
    3939
    40 <screen><userinput>./configure --prefix=/usr</userinput></screen>
     40<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
    4141
    42     <para>Compile the package:</para>
     42    <para os="c">Compile the package:</para>
    4343
    44 <screen><userinput>make</userinput></screen>
     44<screen os="d"><userinput>make</userinput></screen>
    4545
    46     <para>This package does not come with a test suite.</para>
     46    <para os="e">This package does not come with a test suite.</para>
    4747
    48     <para>Install the package:</para>
     48    <para os="f">Install the package:</para>
    4949
    50 <screen><userinput>make install</userinput></screen>
     50<screen os="g"><userinput>make install</userinput></screen>
    5151
    5252  </sect2>

  • final-system/common/perl.xml

    rb8fddc7 re6423a01  
    4040    prepare Perl for compilation with:</para>
    4141
    42 <screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR"</userinput></screen>
    43 
    44     <variablelist os="b">
     42<screen os="b"><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR"</userinput></screen>
     43
     44    <variablelist os="c">
    4545      <title>The meaning of the configure option:</title>
    4646
    47       <varlistentry>
     47      <varlistentry os="c1">
    4848        <term><parameter>-Dpager="/bin/less -isR"</parameter></term>
    4949        <listitem>
    … …  
    5454    </variablelist>
    5555
    56     <para os="c">Compile the package:</para>
    57 
    58 <screen os="d"><userinput>make</userinput></screen>
    59 
    60     <para os="e">To run the test suite, first create a basic
     56    <para os="d">Compile the package:</para>
     57
     58<screen os="e"><userinput>make</userinput></screen>
     59
     60    <para os="f">To run the test suite, first create a basic
    6161    <filename>/etc/hosts</filename> file which is needed by a couple of
    6262    the tests to resolve the network name localhost:</para>
    6363
    64 <screen os="f"><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
    65 
    66     <para os="g">Now run the tests, if desired:</para>
    67 
    68 <screen os="h"><userinput>make test</userinput></screen>
    69 
    70     <para os="i">Install the package:</para>
    71 
    72 <screen os="j"><userinput>make install</userinput></screen>
     64<screen os="g"><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
     65
     66    <para os="h">Now run the tests, if desired:</para>
     67
     68<screen os="i"><userinput>make test</userinput></screen>
     69
     70    <para os="j">Install the package:</para>
     71
     72<screen os="k"><userinput>make install</userinput></screen>
    7373
    7474  </sect2>

  • final-system/common/procps.xml

    rb8fddc7 re6423a01  
    3434    <title>Installation of Procps</title>
    3535
    36     <para>Compile the package:</para>
    37 
    38 <screen><userinput>make</userinput></screen>
    39 
    40     <para>Install the package:</para>
    41 
    42 <screen><userinput>make install</userinput></screen>
     36    <para os="a">Compile the package:</para>
     37
     38<screen os="b"><userinput>make</userinput></screen>
     39
     40    <para os="c">Install the package:</para>
     41
     42<screen os="d"><userinput>make install</userinput></screen>
    4343
    4444  </sect2>

  • final-system/common/psmisc.xml

    rb8fddc7 re6423a01  
    3737    <para os="a">Prepare Psmisc for compilation:</para>
    3838
    39 <screen><userinput>./configure --prefix=/usr --exec-prefix=""</userinput></screen>
     39<screen os="b"><userinput>./configure --prefix=/usr --exec-prefix=""</userinput></screen>
    4040
    41     <variablelist os="b">
     41    <variablelist os="c">
    4242      <title>The meaning of the configure option:</title>
    4343
    … …  
    5454    </variablelist>
    5555
    56     <para os="c">Compile the package:</para>
     56    <para os="d">Compile the package:</para>
    5757
    58 <screen os="d"><userinput>make</userinput></screen>
     58<screen os="e"><userinput>make</userinput></screen>
    5959
    60     <para os="e">Install the package:</para>
     60    <para os="f">Install the package:</para>
    6161
    62 <screen os="f"><userinput>make install</userinput></screen>
     62<screen os="g"><userinput>make install</userinput></screen>
    6363
    64     <para os="g">There is no reason for the <command>pstree</command> and
     64    <para os="h">There is no reason for the <command>pstree</command> and
    6565    <command>pstree.x11</command> programs to reside in <filename
    6666    class="directory">/bin</filename>. Therefore, move them to <filename
    6767    class="directory">/usr/bin</filename>:</para>
    6868
    69 <screen os="h"><userinput>mv /bin/pstree* /usr/bin</userinput></screen>
     69<screen os="i"><userinput>mv /bin/pstree* /usr/bin</userinput></screen>
    7070
    71     <para os="i">By default, Psmisc's <command>pidof</command> program is not installed.
     71    <para os="j">By default, Psmisc's <command>pidof</command> program is not installed.
    7272    This usually is not a problem because it is installed later in the Sysvinit
    7373    package, which provides a better <command>pidof</command> program. If
    … …  
    7575    of Psmisc by creating the following symlink:</para>
    7676
    77 <screen os="j"><userinput>ln -s killall /bin/pidof</userinput></screen>
     77<screen os="k"><userinput>ln -s killall /bin/pidof</userinput></screen>
    7878
    7979  </sect2>

  • final-system/common/readline.xml

    rb8fddc7 re6423a01  
    4444    <para os="c">Prepare Readline for compilation:</para>
    4545
    46 <screen><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
     46<screen os="d"><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
    4747
    48     <para os="d">Compile the package:</para>
     48    <para os="e">Compile the package:</para>
    4949
    50 <screen os="e"><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
     50<screen os="f"><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
    5151
    52     <variablelist os="f">
     52    <variablelist os="g">
    5353      <title>The meaning of the make option:</title>
    5454
    … …  
    6262    </variablelist>
    6363
    64     <para os="g">Install the package:</para>
     64    <para os="h">Install the package:</para>
    6565
    66 <screen os="h"><userinput>make install</userinput></screen>
     66<screen os="i"><userinput>make install</userinput></screen>
    6767
    68     <para os="i">Give Readline's dynamic libraries to a more appropriate
     68    <para os="j">Give Readline's dynamic libraries to a more appropriate
    6969    permissions:</para>
    7070
    71 <screen os="j"><userinput>chmod 755 /lib/lib{readline,history}.so*</userinput></screen>
     71<screen os="k"><userinput>chmod 755 /lib/lib{readline,history}.so*</userinput></screen>
    7272
    73     <para os="k">Now move the static libraries to a more appropriate location:</para>
     73    <para os="l">Now move the static libraries to a more appropriate location:</para>
    7474
    75 <screen os="l"><userinput>mv /lib/lib{readline,history}.a /usr/lib</userinput></screen>
     75<screen os="m"><userinput>mv /lib/lib{readline,history}.a /usr/lib</userinput></screen>
    7676
    77     <para os="m">Next, remove the <filename class="extension">.so</filename>
     77    <para os="n">Next, remove the <filename class="extension">.so</filename>
    7878    files in <filename class="directory">/lib</filename> and relink them into
    7979    <filename class="directory">/usr/lib</filename>.</para>
    8080
    81 <screen os="n"><userinput>rm /lib/lib{readline,history}.so
     81<screen os="o"><userinput>rm /lib/lib{readline,history}.so
    8282ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
    8383ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so</userinput></screen>

  • final-system/common/sed.xml

    rb8fddc7 re6423a01  
    4343    <para os="c">Prepare Sed for compilation:</para>
    4444
    45 <screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
     45<screen os="d"><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
    4646
    47     <para os="d">Compile the package:</para>
     47    <para os="e">Compile the package:</para>
    4848
    49 <screen os="e"><userinput>make</userinput></screen>
     49<screen os="f"><userinput>make</userinput></screen>
    5050
    51     <para os="f">To test the results, issue:
     51    <para os="g">To test the results, issue:
    5252    <userinput>make check</userinput>.</para>
    5353
    54     <para os="g">Install the package:</para>
     54    <para os="h">Install the package:</para>
    5555
    56 <screen os="h"><userinput>make install</userinput></screen>
     56<screen os="i"><userinput>make install</userinput></screen>
    5757
    5858  </sect2>

  • final-system/common/shadow.xml

    rb8fddc7 re6423a01  
    5050    <para os="b">Prepare Shadow for compilation:</para>
    5151
    52 <screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
    53 
    54     <variablelist os="c">
    55       <title>The meaning of the new configure options:</title>
    56 
    57       <varlistentry>
    58         <term><parameter>to be done</parameter></term>
    59         <listitem>
    60           <para>to be done</para>
    61         </listitem>
    62       </varlistentry>
    63 
    64     </variablelist>
     52<screen os="c"><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
    6553
    6654    <para os="d">Disable the installation of the <command>groups</command> program

  • final-system/common/sysklogd.xml

    rb8fddc7 re6423a01  
    4141    <para os="c">Compile the package:</para>
    4242
    43 <screen><userinput>make</userinput></screen>
     43<screen os="d"><userinput>make</userinput></screen>
    4444
    45     <para os="d">Install the package:</para>
     45    <para os="e">Install the package:</para>
    4646
    47 <screen os="e"><userinput>make install</userinput></screen>
     47<screen os="f"><userinput>make install</userinput></screen>
    4848
    4949  </sect2>

  • final-system/common/tar.xml

    rb8fddc7 re6423a01  
    3434    <title>Installation of Tar</title>
    3535
    36 <para os="a">Apply a patch to fix some issues with the test suite when using
     36<para os="p1">Apply a patch to fix some issues with the test suite when using
    3737GCC-&gcc-version;:</para>
    3838
    39 <screen os="a1"><userinput>patch -Np1 -i ../&tar-gcc4_fix-patch;</userinput></screen>
     39<screen os="p2"><userinput>patch -Np1 -i ../&tar-gcc4_fix-patch;</userinput></screen>
    4040
    41     <para os="b">Tar has a bug when the <option>-S</option> option is used with
     41    <para os="p3">Tar has a bug when the <option>-S</option> option is used with
    4242    files larger than 4 GB. The following patch properly fixes this issue:</para>
    4343
    44 <screen os="b1"><userinput>patch -Np1 -i ../&tar-sparse_fix-patch;</userinput></screen>
     44<screen os="p4"><userinput>patch -Np1 -i ../&tar-sparse_fix-patch;</userinput></screen>
    4545
    46     <para os="c">Prepare Tar for compilation:</para>
     46    <para os="a">Prepare Tar for compilation:</para>
    4747
    48 <screen><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
     48<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
    4949
    50     <para os="d">Compile the package:</para>
     50    <para os="c">Compile the package:</para>
    5151
    52 <screen os="e"><userinput>make</userinput></screen>
     52<screen os="d"><userinput>make</userinput></screen>
    5353
    54     <para os="f">To test the results, issue:
     54    <para os="e">To test the results, issue:
    5555    <userinput>make check</userinput>.</para>
    5656
    57     <para os="g">Install the package:</para>
     57    <para os="f">Install the package:</para>
    5858
    59 <screen os="h"><userinput>make install</userinput></screen>
     59<screen os="g"><userinput>make install</userinput></screen>
    6060
    6161  </sect2>

  • final-system/common/texinfo.xml

    rb8fddc7 re6423a01  
    4242    <para os="a">Prepare Texinfo for compilation:</para>
    4343
    44 <screen><userinput>./configure --prefix=/usr</userinput></screen>
     44<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
    4545
    46     <para os="b">Compile the package:</para>
     46    <para os="c">Compile the package:</para>
    4747
    48 <screen os="c"><userinput>make</userinput></screen>
     48<screen os="d"><userinput>make</userinput></screen>
    4949
    50     <para os="d">To test the results, issue:
     50    <para os="e">To test the results, issue:
    5151    <userinput>make check</userinput>.</para>
    5252
    53     <para os="e">Install the package:</para>
     53    <para os="f">Install the package:</para>
    5454
    55 <screen os="f"><userinput>make install</userinput></screen>
     55<screen os="g"><userinput>make install</userinput></screen>
    5656
    57     <para os="g">Optionally, install the components belonging in a TeX
     57    <para os="h">Optionally, install the components belonging in a TeX
    5858    installation:</para>
    5959
    60 <screen os="h"><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen>
     60<screen os="i"><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen>
    6161
    62     <variablelist os="i">
     62    <variablelist os="j">
    6363      <title>The meaning of the make parameter:</title>
    6464
    … …  
    7474    </variablelist>
    7575
    76     <para os="j">The Info documentation system uses a plain text file to hold
     76    <para os="k">The Info documentation system uses a plain text file to hold
    7777    its list of menu entries. The file is located at
    7878    <filename>/usr/share/info/dir</filename>. Unfortunately, due to occasional
    … …  
    8282    the following optional commands will accomplish the task:</para>
    8383
    84 <screen os="k"><userinput>cd /usr/share/info
     84<screen os="l"><userinput>cd /usr/share/info
    8585rm dir
    8686for f in *

  • final-system/common/udev.xml

    rb8fddc7 re6423a01  
    3434    <title>Installation of Udev</title>
    3535
    36     <para os="c">Compile the package:</para>
    37 
    38 <screen><userinput>make EXTRAS="extras/firmware extras/run_directory"</userinput></screen>
    39 
    40     <variablelist os="d">
     36    <para os="a">Compile the package:</para>
     37
     38<screen os="b"><userinput>make EXTRAS="extras/firmware extras/run_directory"</userinput></screen>
     39
     40    <variablelist os="c">
    4141      <title>The meaning of the make parameter:</title>
    4242
    … …  
    5252    </variablelist>
    5353
    54     <para os="e">To test the results, issue:
     54    <para os="d">To test the results, issue:
    5555    <userinput>make test</userinput>.</para>
    5656
    57     <para os="f">Install the package:</para>
    58 
    59 <screen os="g"><userinput>make DESTDIR=/ EXTRAS="extras/firmware extras/run_directory" install</userinput></screen>
    60 
    61     <variablelist os="g1">
     57    <para os="e">Install the package:</para>
     58
     59<screen os="f"><userinput>make DESTDIR=/ EXTRAS="extras/firmware extras/run_directory" install</userinput></screen>
     60
     61    <variablelist os="g">
    6262      <title>The meaning of the make parameter:</title>
    6363
    … …  
    7272
    7373    </variablelist>
     74
    7475    <para os="h">Udev's configuration is far from ideal by default, so install
    7576    the configuration files here:</para>
    … …  
    7778<screen os="i"><userinput>cp ../&udev-config-file; /etc/udev/rules.d/25-lfs.rules</userinput></screen>
    7879
    79     <para os="a">Install the documentation that explains how to create
     80    <para os="j">Install the documentation that explains how to create
    8081    Udev rules:</para>
    8182
    82 <screen os="b"><userinput>install -m644 -D docs/writing_udev_rules/index.html /usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
    83 
    84     <para os="j">Run the <command>udevstart</command> program to create our full
     83<screen os="k"><userinput>install -m644 -D docs/writing_udev_rules/index.html /usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
     84
     85    <para os="l">Run the <command>udevstart</command> program to create our full
    8586    complement of device nodes.</para>
    8687
    87 <screen os="k"><userinput>/sbin/udevstart</userinput></screen>
     88<screen os="m"><userinput>/sbin/udevstart</userinput></screen>
    8889
    8990  </sect2>

  • final-system/common/util-linux.xml

    rb8fddc7 re6423a01  
    5151    <title>Installation of Util-linux</title>
    5252
    53     <para os="a">Util-linux fails to compile against newer versions of
     53    <para os="p1">Util-linux fails to compile against newer versions of
    5454    Linux-Libc-Headers. The following patch properly fixes this issue:</para>
    5555
    56 <screen os="b"><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
    57 
    58     <para os="b1">The following patch fixes build issues with GCC 4.x:</para>
    59 
    60 <screen os="b2"><userinput>patch -Np1 -i ../&util-linux-gcc4_fixes-patch;</userinput></screen>
    61 
    62     <para os="c">Prepare Util-linux for compilation:</para>
    63 
    64 <screen><userinput>./configure</userinput></screen>
    65 
    66     <para os="d">Compile the package:</para>
    67 
    68 <screen os="e"><userinput>make HAVE_KILL=yes HAVE_SLN=yes</userinput></screen>
    69 
    70     <variablelist os="f">
     56<screen os="p2"><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
     57
     58    <para os="p3">The following patch fixes build issues with GCC 4.x:</para>
     59
     60<screen os="p4"><userinput>patch -Np1 -i ../&util-linux-gcc4_fixes-patch;</userinput></screen>
     61
     62    <para os="a">Prepare Util-linux for compilation:</para>
     63
     64<screen os="b"><userinput>./configure</userinput></screen>
     65
     66    <para os="c">Compile the package:</para>
     67
     68<screen os="d"><userinput>make HAVE_KILL=yes HAVE_SLN=yes</userinput></screen>
     69
     70    <variablelist os="e">
    7171      <title>The meaning of the make parameters:</title>
    7272
    73       <varlistentry os="fa">
     73      <varlistentry os="e1">
    7474        <term><parameter>HAVE_KILL=yes</parameter></term>
    7575        <listitem>
    … …  
    7979      </varlistentry>
    8080
    81       <varlistentry os="fb">
     81      <varlistentry os="e2">
    8282        <term><parameter>HAVE_SLN=yes</parameter></term>
    8383        <listitem>
    … …  
    9090    </variablelist>
    9191
    92     <para os="g">This package does not come with a test suite.</para>
    93 
    94     <para os="h">Install the package and move the <command>logger</command> binary
     92    <para os="f">This package does not come with a test suite.</para>
     93
     94    <para os="g">Install the package and move the <command>logger</command> binary
    9595    to <filename class="directory">/bin</filename> as it is needed by the
    9696    LFS-Bootscripts package:</para>
    9797
    98 <screen os="i"><userinput>make HAVE_KILL=yes HAVE_SLN=yes install
     98<screen os="h"><userinput>make HAVE_KILL=yes HAVE_SLN=yes install
    9999mv /usr/bin/logger /bin</userinput></screen>
    100100

  • final-system/common/vim.xml

    rb8fddc7 re6423a01  
    5151<screen os="b"><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h</userinput></screen>
    5252
    53     <para os="e">Prepare Vim for compilation:</para>
    54 
    55 <screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
    56 
    57     <variablelist os="f">
     53    <para os="c">Prepare Vim for compilation:</para>
     54
     55<screen os="d"><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
     56
     57    <variablelist os="e">
    5858      <title>The meaning of the configure options:</title>
    5959
    … …  
    7272    </variablelist>
    7373
    74     <para os="g">Compile the package:</para>
    75 
    76 <screen os="h"><userinput>make</userinput></screen>
    77 
    78     <para os="i">To test the results, issue: <userinput>make test</userinput>.
     74    <para os="f">Compile the package:</para>
     75
     76<screen os="g"><userinput>make</userinput></screen>
     77
     78    <para os="h">To test the results, issue: <userinput>make test</userinput>.
    7979    However, this test suite outputs a lot of binary data to the
    8080    screen, which can cause issues with the settings of the current terminal.
    8181    This can be resolved by redirecting the output to a log file.</para>
    8282
    83     <para os="j">Install the package:</para>
    84 
    85 <screen os="k"><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
    86 
    87     <variablelist os="k1">
     83    <para os="i">Install the package:</para>
     84
     85<screen os="j"><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
     86
     87    <variablelist os="k">
    8888      <title>The meaning of the make option:</title>
    8989

  • final-system/common/zlib.xml

    rb8fddc7 re6423a01  
    4545    <para os="b">Prepare Zlib for compilation:</para>
    4646
    47 <screen><userinput>./configure --prefix=/usr --shared --libdir=/lib</userinput></screen>
     47<screen os="c"><userinput>./configure --prefix=/usr --shared --libdir=/lib</userinput></screen>
    4848
    49     <para os="c">Compile the package:</para>
     49    <para os="d">Compile the package:</para>
    5050
    51 <screen os="d"><userinput>make</userinput></screen>
     51<screen os="e"><userinput>make</userinput></screen>
    5252
    53     <para os="e">To test the results, issue:
     53    <para os="f">To test the results, issue:
    5454    <userinput>make check</userinput>.</para>
    5555
    56     <para os="f">Install the shared library:</para>
     56    <para os="g">Install the shared library:</para>
    5757
    58 <screen os="g"><userinput>make install</userinput></screen>
     58<screen os="h"><userinput>make install</userinput></screen>
    5959
    60     <para os="h">The previous command installed a <filename
     60    <para os="i">The previous command installed a <filename
    6161    class="extension">.so</filename> file in <filename
    6262    class="directory">/lib</filename>. We will remove it and relink it into
    6363    <filename class="directory">/usr/lib</filename>:</para>
    6464
    65 <screen os="i"><userinput>rm /lib/libz.so
     65<screen os="j"><userinput>rm /lib/libz.so
    6666ln -sf ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen>
    6767
    68     <para os="j">Build the static library:</para>
     68    <para os="k">Build the static library:</para>
    6969
    70 <screen><userinput>make clean
     70<screen os="l"><userinput>make clean
    7171./configure --prefix=/usr
    7272make</userinput></screen>
    7373
    74     <para os="k">To test the results again, issue:
     74    <para os="m">To test the results again, issue:
    7575    <userinput>make check</userinput>.</para>
    7676
    77     <para os="l">Install the static library:</para>
     77    <para os="n">Install the static library:</para>
    7878
    79 <screen os="m"><userinput>make install</userinput></screen>
     79<screen os="o"><userinput>make install</userinput></screen>
    8080
    81     <para os="n">Fix the permissions on the static library:</para>
     81    <para os="p">Fix the permissions on the static library:</para>
    8282
    83 <screen os="o"><userinput>chmod 644 /usr/lib/libz.a</userinput></screen>
     83<screen os="q"><userinput>chmod 644 /usr/lib/libz.a</userinput></screen>
    8484
    8585  </sect2>

  • final-system/mips/flex.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of Flex</title>
    2323
    24     <para os="ba">This patch updates <filename>config.guess</filename> and
     24    <para os="p1">This patch updates <filename>config.guess</filename> and
    2525    <filename>config.sub</filename> for MIPS processors.</para>
    2626
    27 <screen os="bb"><userinput>patch -Np1 -i ../&flex-mips_update-patch;</userinput></screen>
     27<screen os="p2"><userinput>patch -Np1 -i ../&flex-mips_update-patch;</userinput></screen>
    2828
    2929   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    8383    xpointer="xpointer(//*[@os='n'])"/>
    8484
     85   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     86    href="../common/flex.xml"
     87    xpointer="xpointer(//*[@os='o'])"/>
     88
    8589</sect2>
    8690

  • final-system/mips/grep.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of Grep</title>
    2323
    24     <para os="ba">This patch updates <filename>config.guess</filename> and
     24    <para os="p1">This patch updates <filename>config.guess</filename> and
    2525    <filename>config.sub</filename> for MIPS processors.</para>
    2626
    27 <screen os="bb"><userinput>patch -Np1 -i ../&grep-mips_update-patch;</userinput></screen>
     27<screen os="p2"><userinput>patch -Np1 -i ../&grep-mips_update-patch;</userinput></screen>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • final-system/mips/make.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of Make</title>
    2323
    24     <para os="m1">This patch updates <filename>config.guess</filename> and
     24    <para os="p1">This patch updates <filename>config.guess</filename> and
    2525    <filename>config.sub</filename> for MIPS processors.</para>
    2626
    27 <screen os="m2"><userinput>patch -Np1 -i ../&make-mips_update-patch;</userinput></screen>
     27<screen os="p2"><userinput>patch -Np1 -i ../&make-mips_update-patch;</userinput></screen>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • final-system/mips/mktemp.xml

    rb8fddc7 re6423a01  
    3030    xpointer="xpointer(//*[@os='b'])"/>
    3131
    32     <para os="m1">This patch updates <filename>config.guess</filename> and
     32    <para os="p1">This patch updates <filename>config.guess</filename> and
    3333    <filename>config.sub</filename> for MIPS processors.</para>
    3434
    35 <screen os="m2"><userinput>patch -Np1 -i ../&mktemp-mips_update-patch;</userinput></screen>
     35<screen os="p2"><userinput>patch -Np1 -i ../&mktemp-mips_update-patch;</userinput></screen>
    3636
    3737    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3838    href="../common/mktemp.xml"
    3939    xpointer="xpointer(//*[@os='c'])"/>
    40 
    41     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    42     href="../common/mktemp.xml"
    43     xpointer="xpointer(//*[@os='c1'])"/>
    4440
    4541    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    6359    xpointer="xpointer(//*[@os='h'])"/>
    6460
     61    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     62    href="../common/mktemp.xml"
     63    xpointer="xpointer(//*[@os='i'])"/>
     64
    6565  </sect2>
    6666

  • final-system/mips/module-init-tools.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of Module-Init-Tools</title>
    2323
    24     <para os="m1">This patch updates <filename>config.guess</filename> and
     24    <para os="p1">This patch updates <filename>config.guess</filename> and
    2525    <filename>config.sub</filename> for MIPS processors.</para>
    2626
    27 <screen os="m2"><userinput>patch -Np1 -i ../&module-init-tools-mips_update-patch;</userinput></screen>
     27<screen os="p2"><userinput>patch -Np1 -i ../&module-init-tools-mips_update-patch;</userinput></screen>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    3737    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3838    href="../common/module-init-tools.xml"
    39     xpointer="xpointer(//*[@os='g'])"/>
    40 
    41     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    42     href="../common/module-init-tools.xml"
    43     xpointer="xpointer(//*[@os='g1'])"/>
    44 
    45     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    46     href="../common/module-init-tools.xml"
    4739    xpointer="xpointer(//*[@os='c'])"/>
    48 
    49     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    50     href="../common/module-init-tools.xml"
    51     xpointer="xpointer(//*[@os='c1'])"/>
    5240
    5341    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    6553    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6654    href="../common/module-init-tools.xml"
     55    xpointer="xpointer(//*[@os='g'])"/>
     56
     57    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     58    href="../common/module-init-tools.xml"
    6759    xpointer="xpointer(//*[@os='h'])"/>
    6860
    … …  
    7062    href="../common/module-init-tools.xml"
    7163    xpointer="xpointer(//*[@os='i'])"/>
     64
     65    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     66    href="../common/module-init-tools.xml"
     67    xpointer="xpointer(//*[@os='j'])"/>
     68
     69    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     70    href="../common/module-init-tools.xml"
     71    xpointer="xpointer(//*[@os='k'])"/>
    7272
    7373  </sect2>

  • final-system/mips64-64-chapter.xml

    rb8fddc7 re6423a01  
    4040  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
    4141  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
    42   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/file.xml"/>
     42  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/file.xml"/>
    4343  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
    4444  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
    … …  
    5151  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
    5252  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/make.xml"/>
    53   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/module-init-tools.xml"/>
     53  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/module-init-tools.xml"/>
    5454  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
    5555  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
    … …  
    6161  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/util-linux.xml"/>
    6262  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
    63   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/mktemp.xml"/>
     63  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/mktemp.xml"/>
    6464  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hotplug.xml"/>
    6565  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>

  • final-system/mips64-64/make.xml

    rb8fddc7 re6423a01  
    3434    xpointer="xpointer(//*[@os='a'])"/>
    3535
    36 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
     36    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    href="../multilib/make.xml"
     38    xpointer="xpointer(//*[@os='b'])"/>
    3739
    3840    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • final-system/mips64-chapter.xml

    rb8fddc7 re6423a01  
    7474  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
    7575  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
    76   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/procps-n32.xml"/>
     76  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-n32.xml"/>
    7777  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
    7878  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>

  • final-system/mips64/file-64bit.xml

    rb8fddc7 re6423a01  
    3535    xpointer="xpointer(//*[@os='a'])"/>
    3636
    37 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     37<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    3838   --libdir=/usr/lib64</userinput></screen>
    3939

  • final-system/mips64/file-n32.xml

    rb8fddc7 re6423a01  
    3535    xpointer="xpointer(//*[@os='a'])"/>
    3636
    37 <screen><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
     37<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
    3838   --libdir=/usr/lib32</userinput></screen>
    3939

  • final-system/mips64/file.xml

    rb8fddc7 re6423a01  
    3535    xpointer="xpointer(//*[@os='a'])"/>
    3636
    37 <screen><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
     37<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
    3838
    3939    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • final-system/mips64/flex-64bit.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="flex.xml"
    26     xpointer="xpointer(//*[@os='ba'])"/>
     26    xpointer="xpointer(//*[@os='p1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="flex.xml"
    30     xpointer="xpointer(//*[@os='bb'])"/>
     30    xpointer="xpointer(//*[@os='p2'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    5252    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5353    href="../multilib/flex-64bit.xml"
    54     xpointer="xpointer(//*[@os='m4'])"/>
     54    xpointer="xpointer(//*[@os='f'])"/>
    5555
    5656    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5757    href="flex.xml"
    58     xpointer="xpointer(//*[@os='f'])"/>
     58    xpointer="xpointer(//*[@os='g'])"/>
    5959
    6060    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6161    href="../common/flex.xml"
    62     xpointer="xpointer(//*[@os='g'])"/>
    63 
    64     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    65     href="../multilib/flex-64bit.xml"
    6662    xpointer="xpointer(//*[@os='h'])"/>
    6763
    … …  
    7167
    7268    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    73     href="../multilib/flex-64bit.xml"
     69    href="flex.xml"
    7470    xpointer="xpointer(//*[@os='j'])"/>
    7571
    7672    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    77     href="../multilib/flex-64bit.xml"
    78     xpointer="xpointer(//*[@os='j'])"/>
    79 
    80     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    81     href="../multilib/flex-64bit.xml"
     73    href="flex.xml"
    8274    xpointer="xpointer(//*[@os='k'])"/>
    8375
    … …  
    8779
    8880    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    89     href="../common/flex.xml"
     81    href="../multilib/flex-64bit.xml"
    9082    xpointer="xpointer(//*[@os='m'])"/>
    9183
    … …  
    9385    href="../common/flex.xml"
    9486    xpointer="xpointer(//*[@os='n'])"/>
     87
     88    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     89    href="../common/flex.xml"
     90    xpointer="xpointer(//*[@os='o'])"/>
    9591
    9692  </sect2>

  • final-system/mips64/flex-n32.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="flex.xml"
    26     xpointer="xpointer(//*[@os='ba'])"/>
     26    xpointer="xpointer(//*[@os='p1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="flex.xml"
    30     xpointer="xpointer(//*[@os='bb'])"/>
     30    xpointer="xpointer(//*[@os='p2'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    5050    xpointer="xpointer(//*[@os='e'])"/>
    5151
    52     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    53     href="flex.xml"
    54     xpointer="xpointer(//*[@os='f'])"/>
    55 
    56 <screen><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
     52<screen os="f"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
    5753   --libdir=/usr/lib32</userinput></screen>
    5854
    5955    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6056    href="flex.xml"
    61     xpointer="xpointer(//*[@os='i'])"/>
     57    xpointer="xpointer(//*[@os='g'])"/>
    6258
    6359    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6460    href="flex.xml"
    65     xpointer="xpointer(//*[@os='m2'])"/>
     61    xpointer="xpointer(//*[@os='h'])"/>
    6662
    67     <para>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='j'])"/>
     66
     67    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     68    href="flex.xml"
     69    xpointer="xpointer(//*[@os='k'])"/>
     70
     71    <para os="l">There are some packages that expect to find the
    6872    <filename class="libraryfile">lex</filename> library in <filename
    6973    class="directory">/usr/lib32</filename>. Create a symlink to account for
    7074    this:</para>
    7175
    72 <screen><userinput>ln -s libfl.a /usr/lib32/libl.a</userinput></screen>
     76<screen os="m"><userinput>ln -s libfl.a /usr/lib32/libl.a</userinput></screen>
    7377
    7478  </sect2>

  • final-system/mips64/flex.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../mips/flex.xml"
    26     xpointer="xpointer(//*[@os='ba'])"/>
     26    xpointer="xpointer(//*[@os='p1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="../mips/flex.xml"
    30     xpointer="xpointer(//*[@os='bb'])"/>
     30    xpointer="xpointer(//*[@os='p2'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    5151
    5252    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    53     href="../common/flex.xml"
     53    href="../multilib/flex.xml"
    5454    xpointer="xpointer(//*[@os='f'])"/>
    5555
    5656    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     57    href="../common/flex.xml"
     58    xpointer="xpointer(//*[@os='g'])"/>
     59
     60    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5761    href="../multilib/flex.xml"
    58     xpointer="xpointer(//*[@os='m1'])"/>
     62    xpointer="xpointer(//*[@os='h'])"/>
    5963
    6064    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6165    href="../common/flex.xml"
    62     xpointer="xpointer(//*[@os='i'])"/>
    63 
    64     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    65     href="../multilib/flex.xml"
    66     xpointer="xpointer(//*[@os='m2'])"/>
     66    xpointer="xpointer(//*[@os='j'])"/>
    6767
    6868    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    7373    href="../common/flex.xml"
    7474    xpointer="xpointer(//*[@os='l'])"/>
     75
     76    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     77    href="../common/flex.xml"
     78    xpointer="xpointer(//*[@os='m'])"/>
    7579
    7680  </sect2>

  • final-system/mips64/grep.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../mips/grep.xml"
    26     xpointer="xpointer(//*[@os='ba'])"/>
     26    xpointer="xpointer(//*[@os='p1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="../mips/grep.xml"
    30     xpointer="xpointer(//*[@os='bb'])"/>
     30    xpointer="xpointer(//*[@os='p2'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    3636    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3737    href="../multilib/grep.xml"
    38     xpointer="xpointer(//*[@os='aa'])"/>
     38    xpointer="xpointer(//*[@os='b'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • final-system/mips64/make.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../mips/make.xml"
    26     xpointer="xpointer(//*[@os='m1'])"/>
     26    xpointer="xpointer(//*[@os='p1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="../mips/make.xml"
    30     xpointer="xpointer(//*[@os='m2'])"/>
     30    xpointer="xpointer(//*[@os='p2'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    3434    xpointer="xpointer(//*[@os='a'])"/>
    3535
    36 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
     36    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    href="../multilib/make.xml"
     38    xpointer="xpointer(//*[@os='b'])"/>
    3739
    3840    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • final-system/mips64/mktemp.xml

    rb8fddc7 re6423a01  
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3333    href="../mips/mktemp.xml"
    34     xpointer="xpointer(//*[@os='m1'])"/>
     34    xpointer="xpointer(//*[@os='p1'])"/>
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3737    href="../mips/mktemp.xml"
    38     xpointer="xpointer(//*[@os='m2'])"/>
     38    xpointer="xpointer(//*[@os='p2'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    45     href="../common/mktemp.xml"
    46     xpointer="xpointer(//*[@os='c1'])"/>
    47 
    48     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    49     href="../common/mktemp.xml"
    50     xpointer="xpointer(//*[@os='c1'])"/>
     45    href="../multilib/mktemp.xml"
     46    xpointer="xpointer(//*[@os='d'])"/>
    5147
    5248    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    7066    xpointer="xpointer(//*[@os='h'])"/>
    7167
     68    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     69    href="../common/mktemp.xml"
     70    xpointer="xpointer(//*[@os='i'])"/>
     71
    7272  </sect2>
    7373

  • final-system/mips64/module-init-tools.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../mips/module-init-tools.xml"
    26     xpointer="xpointer(//*[@os='m1'])"/>
     26    xpointer="xpointer(//*[@os='p1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="../mips/module-init-tools.xml"
    30     xpointer="xpointer(//*[@os='m2'])"/>
     30    xpointer="xpointer(//*[@os='p2'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    4040    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    4141    href="../common/module-init-tools.xml"
    42     xpointer="xpointer(//*[@os='g'])"/>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    45     href="../multilib/module-init-tools.xml"
    46     xpointer="xpointer(//*[@os='g1'])"/>
    47 
    48     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    49     href="../common/module-init-tools.xml"
    5042    xpointer="xpointer(//*[@os='c'])"/>
    5143
    5244    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5345    href="../multilib/module-init-tools.xml"
    54     xpointer="xpointer(//*[@os='c1'])"/>
    55 
    56     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    57     href="../common/module-init-tools.xml"
    5846    xpointer="xpointer(//*[@os='d'])"/>
    5947
    … …  
    6351
    6452    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    65     href="../common/module-init-tools.xml"
     53    href="../multilib/module-init-tools.xml"
    6654    xpointer="xpointer(//*[@os='f'])"/>
    6755
    … …  
    7866    xpointer="xpointer(//*[@os='i'])"/>
    7967
     68    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     69    href="../common/module-init-tools.xml"
     70    xpointer="xpointer(//*[@os='j'])"/>
     71
     72    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     73    href="../common/module-init-tools.xml"
     74    xpointer="xpointer(//*[@os='k'])"/>
     75
    8076  </sect2>
    8177

  • final-system/mips64/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='p1'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    href="../common/util-linux.xml"
     34    xpointer="xpointer(//*[@os='p2'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    href="../common/util-linux.xml"
     38    xpointer="xpointer(//*[@os='p3'])"/>
     39
     40    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     41    href="../common/util-linux.xml"
     42    xpointer="xpointer(//*[@os='p4'])"/>
     43
     44    <para os="p5">Util-linux has a compilation error when built using 64bit
     45    and a MIPS processor. The follow patch addresses this error:</para>
     46
     47<screen os="p6"><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
     48
     49    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     50    href="../common/util-linux.xml"
    3051    xpointer="xpointer(//*[@os='a'])"/>
    3152
    3253    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    33     href="../common/util-linux.xml"
    34     xpointer="xpointer(//*[@os='b1'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../common/util-linux.xml"
    38     xpointer="xpointer(//*[@os='b2'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="../common/util-linux.xml"
     54    href="../multilib/util-linux.xml"
    4255    xpointer="xpointer(//*[@os='b'])"/>
    43 
    44     <para os="aa">Util-linux has a compilation error when built using 64bit
    45     and a MIPS processor. The follow patch addresses this error:</para>
    46 
    47 <screen os="ab"><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
    4856
    4957    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5058    href="../common/util-linux.xml"
    5159    xpointer="xpointer(//*[@os='c'])"/>
    52 
    53 <screen><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
    5460
    5561    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    6066    href="../common/util-linux.xml"
    6167    xpointer="xpointer(//*[@os='e'])"/>
     68
    6269    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6370    href="../common/util-linux.xml"
    … …  
    7279    xpointer="xpointer(//*[@os='h'])"/>
    7380
    74     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    75     href="../common/util-linux.xml"
    76     xpointer="xpointer(//*[@os='i'])"/>
    77 
    7881  </sect2>
    7982

  • 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

  • final-system/ppc/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>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/usr</userinput></screen>
     28<screen os="b"><userinput>CPPFLAGS=-D_GNU_SOURCE ./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/sparc/kbd.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of Kbd</title>
    2323
    24     <para os="a">Sparcs haven't updated the structure of <command>kbdrate</command>
     24    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     25    href="../common/kbd.xml"
     26    xpointer="xpointer(//*[@os='p1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     29    href="../common/kbd.xml"
     30    xpointer="xpointer(//*[@os='p2'])"/>
     31
     32    <para os="p3">Sparcs haven't updated the structure of <command>kbdrate</command>
    2533    yet, so until they do this patch is required:</para>
    2634
    27 <screen os="b"><userinput>patch -Np1 -i ../&kbd-sparc_kbdrate-patch;</userinput></screen>
     35<screen os="p4"><userinput>patch -Np1 -i ../&kbd-sparc_kbdrate-patch;</userinput></screen>
    2836
    29     <para>Prepare Kbd for compilation:</para>
     37    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     38    href="../common/kbd.xml"
     39    xpointer="xpointer(//*[@os='a'])"/>
    3040
    31 <screen><userinput>./configure</userinput></screen>
     41    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     42    href="../common/kbd.xml"
     43    xpointer="xpointer(//*[@os='b'])"/>
     44       
     45    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     46    href="../common/kbd.xml"
     47    xpointer="xpointer(//*[@os='c'])"/>
    3248
    33     <para>Compile the package:</para>
     49    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     50    href="../common/kbd.xml"
     51    xpointer="xpointer(//*[@os='d'])"/>
    3452
    35 <screen><userinput>make</userinput></screen>
     53    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     54    href="../common/kbd.xml"
     55    xpointer="xpointer(//*[@os='e'])"/>
    3656
    37     <para>Install the package:</para>
    38 
    39 <screen><userinput>make install</userinput></screen>
     57    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     58    href="../common/kbd.xml"
     59    xpointer="xpointer(//*[@os='f'])"/>
    4060
    4161  </sect2>

  • final-system/sparc64/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
    3232    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    3333    href="../sparc/kbd.xml"
     34    xpointer="xpointer(//*[@os='p3'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    href="../sparc/kbd.xml"
     38    xpointer="xpointer(//*[@os='p4'])"/>
     39
     40    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     41    href="../common/kbd.xml"
    3442    xpointer="xpointer(//*[@os='a'])"/>
    3543
    3644    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../sparc/kbd.xml"
     45    href="../multilib/kbd.xml"
    3846    xpointer="xpointer(//*[@os='b'])"/>
    3947
    40     <para>Prepare Kbd for compilation:</para>
     48    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     49    href="../common/kbd.xml"
     50    xpointer="xpointer(//*[@os='c'])"/>
    4151
    42 <screen><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
     52    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     53    href="../multilib/kbd.xml"
     54    xpointer="xpointer(//*[@os='d'])"/>
    4355
    44     <para>Compile the package:</para>
     56    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     57    href="../common/kbd.xml"
     58    xpointer="xpointer(//*[@os='e'])"/>
    4559
    46 <screen><userinput>make</userinput></screen>
    47 
    48     <para>Install the package:</para>
    49 
    50 <screen><userinput>make install</userinput></screen>
     60    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     61    href="../common/kbd.xml"
     62    xpointer="xpointer(//*[@os='f'])"/>
    5163
    5264  </sect2>

  • final-system/x86_64-64/gettext.xml

    rb8fddc7 re6423a01  
    2222    <title>Installation of Gettext</title>
    2323
    24     <para os="a">Gettext includes its own version of Libtool which is broken
     24    <para os="x1">Gettext includes its own version of Libtool which is broken
    2525    for x86_64 (it tries to link statically linked archives compiled without
    2626    -fPIC against shared objects) see (<ulink
    … …  
    2929    the main language tests can be run.</para>
    3030
    31 <screen os="b"><userinput>sed -i -e '2iexit 77' autoconf-lib-link/tests/rpath-3*[ef]</userinput></screen>
     31<screen os="x2"><userinput>sed -i -e '2iexit 77' autoconf-lib-link/tests/rpath-3*[ef]</userinput></screen>
    3232
    33     <para>Prepare Gettext for compilation:</para>
     33    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     34    href="../common/gettext.xml"
     35    xpointer="xpointer(//*[@os='a'])"/>
    3436
    35 <screen><userinput>./configure --prefix=/usr</userinput></screen>
     37    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     38    href="../common/gettext.xml"
     39    xpointer="xpointer(//*[@os='b'])"/>
    3640
    37     <para>Compile the package:</para>
     41    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     42    href="../common/gettext.xml"
     43    xpointer="xpointer(//*[@os='c'])"/>
    3844
    39 <screen><userinput>make</userinput></screen>
     45    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     46    href="../common/gettext.xml"
     47    xpointer="xpointer(//*[@os='d'])"/>
    4048
    41     <para>To test the results, issue: <userinput>make check</userinput>.</para>
     49    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     50    href="../common/gettext.xml"
     51    xpointer="xpointer(//*[@os='e'])"/>
    4252
    43     <para>Install the package:</para>
     53    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     54    href="../common/gettext.xml"
     55    xpointer="xpointer(//*[@os='f'])"/>
    4456
    45 <screen><userinput>make install</userinput></screen>
     57    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     58    href="../common/gettext.xml"
     59    xpointer="xpointer(//*[@os='g'])"/>
    4660
    4761  </sect2>

  • final-system/x86_64-chapter.xml

    rb8fddc7 re6423a01  
    3838  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
    3939  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
    40   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gettext-64bit.xml"/>
     40  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
    4141  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
    4242  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>

  • final-system/x86_64/gettext-64bit.xml

    rb8fddc7 re6423a01  
    2424    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../x86_64-64/gettext.xml"
     26    xpointer="xpointer(//*[@os='x1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     29    href="../x86_64-64/gettext.xml"
     30    xpointer="xpointer(//*[@os='x2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    href="../common/gettext.xml"
    2634    xpointer="xpointer(//*[@os='a'])"/>
    2735
    2836    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    29     href="../x86_64-64/gettext.xml"
     37    href="../multilib/gettext-64bit.xml"
    3038    xpointer="xpointer(//*[@os='b'])"/>
    3139
    32     <para>Prepare Gettext for compilation:</para>
     40    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     41    href="../common/gettext.xml"
     42    xpointer="xpointer(//*[@os='c'])"/>
    3343
    34 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    35    ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
     44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    href="../common/gettext.xml"
     46    xpointer="xpointer(//*[@os='d'])"/>
    3647
    37     <para>Compile the package:</para>
     48    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     49    href="../common/gettext.xml"
     50    xpointer="xpointer(//*[@os='e'])"/>
    3851
    39 <screen><userinput>make</userinput></screen>
     52    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     53    href="../common/gettext.xml"
     54    xpointer="xpointer(//*[@os='f'])"/>
    4055
    41     <para>To test the results, issue: <userinput>make check</userinput>.</para>
    42 
    43     <para>Install the package:</para>
    44 
    45 <screen><userinput>make install</userinput></screen>
     56    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     57    href="../common/gettext.xml"
     58    xpointer="xpointer(//*[@os='g'])"/>
    4659
    4760  </sect2>
Note: See TracChangeset for help on using the changeset viewer.