Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

Location:
BOOK/final-system/multilib
Files:
19 added
9 deleted
55 edited
7 moved

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/multilib/automake.xml

    r88ef769 r03e6a40  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     29    --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
    2930
    3031    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/binutils.xml

    r88ef769 r03e6a40  
    8282    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8383    href="../common/binutils.xml"
    84     xpointer="xpointer(//*[@os='m'])"/>
    85 
    86     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    87     href="../common/binutils.xml"
    8884    xpointer="xpointer(//*[@os='n'])"/>
    8985
    … …  
    108104    xpointer="xpointer(//*[@os='s'])"/>
    109105
    110     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    111     href="../common/binutils.xml"
    112     xpointer="xpointer(//*[@os='t'])"/>
    113 
    114     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    115     href="../common/binutils.xml"
    116     xpointer="xpointer(//*[@os='u'])"/>
    117 
    118106  </sect2>
    119107

  • BOOK/final-system/multilib/bison-64bit.xml

    r88ef769 r03e6a40  
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/bison.xml"
    26     xpointer="xpointer(//*[@os='t3'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/bison.xml"
    30     xpointer="xpointer(//*[@os='t4'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/bison.xml"
    3426    xpointer="xpointer(//*[@os='a'])"/>
    3527
    36 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64  --cache-file=config.cache</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" M4=m4 \
     29    ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    3730
    3831    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/bison-n32.xml

    r88ef769 r03e6a40  
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/bison.xml"
    27     xpointer="xpointer(//*[@os='t3'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/bison.xml"
    31     xpointer="xpointer(//*[@os='t4'])"/>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/bison.xml"
    3527    xpointer="xpointer(//*[@os='a'])"/>
    3628
    37 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32  --cache-file=config.cache</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" M4=m4 \
     30    ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
    3831
    3932    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/bison.xml

    r88ef769 r03e6a40  
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/bison.xml"
    27     xpointer="xpointer(//*[@os='t3'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/bison.xml"
    31     xpointer="xpointer(//*[@os='t4'])"/>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/bison.xml"
    3527    xpointer="xpointer(//*[@os='a'])"/>
    3628
    37 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr  --cache-file=config.cache</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" M4=m4 \
     30    ./configure --prefix=/usr</userinput></screen>
    3831
    3932    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r88ef769 r03e6a40  
    2929    href="bzip2.xml"
    3030    xpointer="xpointer(//*[@os='s2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/bzip2.xml"
     34    xpointer="xpointer(//*[@os='s3'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37    href="../common/bzip2.xml"
     38    xpointer="xpointer(//*[@os='s4'])"/>
    3139
    3240    <para os="m1">We need to change the default lib path

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

    r88ef769 r03e6a40  
    3030    href="bzip2.xml"
    3131    xpointer="xpointer(//*[@os='s2'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/bzip2.xml"
     35    xpointer="xpointer(//*[@os='s3'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/bzip2.xml"
     39    xpointer="xpointer(//*[@os='s4'])"/>
    3240
    3341    <para os="m1">We need to change the default lib path

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

    r88ef769 r03e6a40  
    3030    href="../common/bzip2.xml"
    3131    xpointer="xpointer(//*[@os='s2'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/bzip2.xml"
     35    xpointer="xpointer(//*[@os='s3'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/bzip2.xml"
     39    xpointer="xpointer(//*[@os='s4'])"/>
    3240
    3341    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/cloog-64bit.xml

    r88ef769 r03e6a40  
    3030  ./configure --prefix=/usr \
    3131    --libdir=/usr/lib64 --enable-shared --with-isl=system</userinput></screen>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/cloog.xml"
     35    xpointer="xpointer(//*[@os='s1'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/cloog.xml"
     39    xpointer="xpointer(//*[@os='s2'])"/>
    3240
    3341    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/cloog-n32.xml

    r88ef769 r03e6a40  
    3131  ./configure --prefix=/usr \
    3232    --libdir=/usr/lib32 --enable-shared --with-isl=system</userinput></screen>
     33
     34    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     35    href="../common/cloog.xml"
     36    xpointer="xpointer(//*[@os='s1'])"/>
     37
     38    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     39    href="../common/cloog.xml"
     40    xpointer="xpointer(//*[@os='s2'])"/>
    3341
    3442    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/cloog.xml

    r88ef769 r03e6a40  
    3131  ./configure --prefix=/usr \
    3232    --host=${CLFS_TARGET32} --enable-shared --with-isl=system</userinput></screen>
     33
     34    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     35    href="../common/cloog.xml"
     36    xpointer="xpointer(//*[@os='s1'])"/>
     37
     38    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     39    href="../common/cloog.xml"
     40    xpointer="xpointer(//*[@os='s2'])"/>
    3341
    3442    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/coreutils.xml

    r88ef769 r03e6a40  
    107107    xpointer="xpointer(//*[@os='t'])"/>
    108108
    109     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    110     href="../common/coreutils.xml"
    111     xpointer="xpointer(//*[@os='u'])"/>
    112 
    113109  </sect2>
    114110

  • BOOK/final-system/multilib/dbus.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-eudev-32" role="wrap">
    9   <?dbhtml filename="eudev.html"?>
     8<sect1 id="ch-system-dbus-32" role="wrap">
     9  <?dbhtml filename="dbus.html"?>
    1010
    11   <title>Eudev-&eudev-version; 32 Bit Libraries</title>
     11  <title>D-Bus-&dbus-version; 32 Bit Libraries</title>
    1212
    13   <indexterm zone="ch-system-eudev-32">
    14     <primary sortas="a-Eudev">Eudev 32 Bit Libraries</primary>
    15     <secondary>32 Bit</secondary>
     13  <indexterm zone="ch-system-dbus-32">
     14    <primary sortas="a-D-Bus">D-Bus 32 Bit Libraries</primary>
    1615  </indexterm>
    1716
    1817  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/eudev.xml"
     18  href="../common/dbus.xml"
    2019  xpointer="xpointer(//*[@role='package'])"/>
    2120
    2221  <sect2 role="installation">
    23     <title>Installation of Eudev</title>
     22    <title>Installation of D-Bus</title>
    2423
    2524    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/eudev.xml"
     25    href="../common/dbus.xml"
    2726    xpointer="xpointer(//*[@os='a'])"/>
    2827
    29 <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} \
    30 CC="gcc ${BUILD32}" ./configure --prefix=/usr --sysconfdir=/etc \
    31     --with-rootprefix="" --libexecdir=/lib --enable-split-usr \
    32     --libdir=/usr/lib --with-rootlibdir=/lib --sbindir=/sbin --bindir=/sbin \
    33     --enable-rule_generator --disable-introspection --disable-keymap \
    34     --disable-gudev --disable-gtk-doc-html --enable-libkmod</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD32}" USE_ARCH=32 PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} \
     29  ./configure --prefix=/usr --sysconfdir=/etc \
     30    --libdir=/usr/lib --libexecdir=/usr/lib/dbus-1.0 \
     31    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system \
     32    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
    3533
    3634    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/eudev.xml"
     35    href="../common/dbus.xml"
    3836    xpointer="xpointer(//*[@os='c'])"/>
    3937
    4038    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/eudev.xml"
     39    href="../common/dbus.xml"
    4240    xpointer="xpointer(//*[@os='d'])"/>
    4341
    4442    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/eudev.xml"
     43    href="../common/dbus.xml"
    4644    xpointer="xpointer(//*[@os='e'])"/>
    4745
    4846    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/eudev.xml"
    50     xpointer="xpointer(//*[@os='e2'])"/>
     47    href="../common/dbus.xml"
     48    xpointer="xpointer(//*[@os='f'])"/>
    5149
    5250    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="../common/eudev.xml"
     51    href="../common/dbus.xml"
    5452    xpointer="xpointer(//*[@os='g'])"/>
    5553
    5654    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    57     href="../common/eudev.xml"
     55    href="../common/dbus.xml"
    5856    xpointer="xpointer(//*[@os='h'])"/>
     57
     58    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     59    href="../common/dbus.xml"
     60    xpointer="xpointer(//*[@os='i'])"/>
    5961
    6062  </sect2>
    … …  
    6466
    6567    <para>Details on this package are located in <xref
    66     linkend="contents-eudev" role="."/></para>
     68    linkend="contents-dbus" role="."/></para>
    6769
    6870  </sect2>

  • BOOK/final-system/multilib/diffutils.xml

    r88ef769 r03e6a40  
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/diffutils.xml"
     26    xpointer="xpointer(//*[@os='s1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/diffutils.xml"
     30    xpointer="xpointer(//*[@os='s2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/diffutils.xml"
    2634    xpointer="xpointer(//*[@os='a'])"/>
    2735
    … …  
    3038    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3139    href="../common/diffutils.xml"
    32     xpointer="xpointer(//*[@os='s1'])"/>
     40    xpointer="xpointer(//*[@os='s3'])"/>
    3341
    3442    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3543    href="../common/diffutils.xml"
    36     xpointer="xpointer(//*[@os='s2'])"/>
     44    xpointer="xpointer(//*[@os='s4'])"/>
    3745
    3846    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/e2fsprogs-64bit.xml

    r88ef769 r03e6a40  
    3939    xpointer="xpointer(//*[@os='c'])"/>
    4040
    41 <screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
    42   ../configure --prefix=/usr --with-root-prefix="" \
     41<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
     42CC="gcc ${BUILD64}"  \
     43../configure --prefix=/usr --with-root-prefix="" \
    4344    --enable-elf-shlibs --disable-libblkid \
    4445    --disable-libuuid --disable-fsck \

  • BOOK/final-system/multilib/e2fsprogs-n32.xml

    r88ef769 r03e6a40  
    4040    xpointer="xpointer(//*[@os='c'])"/>
    4141
    42 <screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
    43   ../configure --prefix=/usr --with-root-prefix="" \
     42<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
     43CC="gcc ${BUILDN32}" \
     44../configure --prefix=/usr --with-root-prefix="" \
    4445    --enable-elf-shlibs --disable-libblkid \
    4546    --disable-libuuid --disable-fsck \

  • BOOK/final-system/multilib/e2fsprogs.xml

    r88ef769 r03e6a40  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37 <screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
    38   ../configure --prefix=/usr --with-root-prefix="" \
     37<screen os="d"><userinput>PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
     38CC="gcc ${BUILD32}" \
     39../configure --prefix=/usr --with-root-prefix="" \
    3940    --enable-elf-shlibs --disable-libblkid \
    4041    --disable-libuuid --disable-fsck \

  • BOOK/final-system/multilib/flex-64bit.xml

    r88ef769 r03e6a40  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    29     --libdir=/usr/lib64</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" M4=m4 ./configure --prefix=/usr \
     29    --libdir=/usr/lib64 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
    3030
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    5353    xpointer="xpointer(//*[@os='g'])"/>
    5454
    55     <para os="h">There are some packages that expect to find the
    56     <filename class="libraryfile">lex</filename> library in <filename
    57     class="directory">/usr/lib64</filename>. Create a symlink to account for
    58     this:</para>
    59 
    60 <screen os="i"><userinput>ln -sv libfl.a /usr/lib64/libl.a</userinput></screen>
     55    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     56    href="../common/flex.xml"
     57    xpointer="xpointer(//*[@os='h'])"/>
    6158
    6259    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6360    href="../common/flex.xml"
    64     xpointer="xpointer(//*[@os='j'])"/>
    65 
    66     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    67     href="../common/flex.xml"
    68     xpointer="xpointer(//*[@os='k'])"/>
     61    xpointer="xpointer(//*[@os='i'])"/>
    6962
    7063  </sect2>

  • BOOK/final-system/multilib/flex-n32.xml

    r88ef769 r03e6a40  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
    29    --libdir=/usr/lib32</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILDN32}" M4=m4 ./configure --prefix=/usr \
     29   --libdir=/usr/lib32 --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
    3030
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4545    xpointer="xpointer(//*[@os='g'])"/>
    4646
    47     <para os="h">There are some packages that expect to find the
    48     <filename class="libraryfile">lex</filename> library in <filename
    49     class="directory">/usr/lib32</filename>. Create a symlink to account for
    50     this:</para>
    51 
    52 <screen os="i"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
    53 
    5447  </sect2>
    5548

  • BOOK/final-system/multilib/flex.xml

    r88ef769 r03e6a40  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILD32}" M4=m4 ./configure --prefix=/usr \
     30    --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
    3031
    3132    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    3334    xpointer="xpointer(//*[@os='c'])"/>
    3435
    35 <screen os="d"><userinput>make libfl.a libfl_pic.a</userinput></screen>
     36<screen os="d"><userinput>make</userinput></screen>
    3637
    3738    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    3940    xpointer="xpointer(//*[@os='f'])"/>
    4041
    41 <screen os="g"><userinput>make install-libLIBRARIES</userinput></screen>
    42 
    43     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/flex.xml"
    45     xpointer="xpointer(//*[@os='h'])"/>
    46 
    47     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/flex.xml"
    49     xpointer="xpointer(//*[@os='i'])"/>
     42<screen os="g"><userinput>make install</userinput></screen>
    5043
    5144  </sect2>

  • BOOK/final-system/multilib/gawk.xml

    r88ef769 r03e6a40  
    5353    xpointer="xpointer(//*[@os='g'])"/>
    5454
     55    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     56    href="../common/gawk.xml"
     57    xpointer="xpointer(//*[@os='h'])"/>
     58
     59    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     60    href="../common/gawk.xml"
     61    xpointer="xpointer(//*[@os='i'])"/>
     62
    5563  </sect2>
    5664

  • BOOK/final-system/multilib/gcc.xml

    r88ef769 r03e6a40  
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4141    href="../common/gcc.xml"
    42     xpointer="xpointer(//*[@os='d'])"/>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/gcc.xml"
    46     xpointer="xpointer(//*[@os='e'])"/>
    47 
    48     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/gcc.xml"
    5042    xpointer="xpointer(//*[@os='f'])"/>
    5143
    … …  
    6557    --enable-__cxa_atexit --enable-c99 --enable-long-long \
    6658    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
    67     --enable-cloog-backend=isl --disable-isl-version-check --with-system-zlib \
    68     --enable-checking=release --enable-libstdcxx-time \
    69     --disable-install-libiberty</userinput></screen>
     59    --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
    7060
    7161    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/gettext-64bit.xml

    r88ef769 r03e6a40  
    2727
    2828<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    29    ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
     29   ./configure --prefix=/usr --libdir=/usr/lib64 \
     30   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
    3031
    3132   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/gettext-n32.xml

    r88ef769 r03e6a40  
    2828
    2929<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    30    ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
     30   ./configure --prefix=/usr --libdir=/usr/lib32 \
     31   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
    3132
    3233   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/gettext.xml

    r88ef769 r03e6a40  
    2828
    2929<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    30    ./configure --prefix=/usr</userinput></screen>
     30   ./configure --prefix=/usr \
     31   --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
    3132
    3233    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/glibc-64bit.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-eglibc" role="wrap">
    9   <?dbhtml filename="eglibc-64bit.html"?>
     8<sect1 id="ch-system-glibc" role="wrap">
     9  <?dbhtml filename="glibc-64bit.html"?>
    1010
    11   <title>Glibc-&eglibc-version; 64-Bit</title>
     11  <title>Glibc-&glibc-version; 64-Bit</title>
    1212
    13   <indexterm zone="ch-system-eglibc">
    14     <primary sortas="a-EGLIBC">EGLIBC</primary>
     13  <indexterm zone="ch-system-glibc">
     14    <primary sortas="a-GLIBC">GLIBC</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="eglibc.xml"
     18  href="glibc.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of EGLIBC</title>
     22    <title>Installation of GLIBC</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/eglibc.xml"
     25    href="../common/glibc.xml"
    2626    xpointer="xpointer(//*[@os='l1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/eglibc.xml"
     29    href="../common/glibc.xml"
    3030    xpointer="xpointer(//*[@os='l2'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/eglibc.xml"
     33    href="../common/glibc.xml"
    3434    xpointer="xpointer(//*[@os='l3'])"/>
    3535
    … …  
    4040
    4141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="eglibc.xml"
     42    href="glibc.xml"
    4343    xpointer="xpointer(//*[@os='b'])"/>
    4444
    4545    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    46     href="../common/eglibc.xml"
     46    href="../common/glibc.xml"
    4747    xpointer="xpointer(//*[@os='s1'])"/>
    4848
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/eglibc.xml"
     50    href="../common/glibc.xml"
    5151    xpointer="xpointer(//*[@os='s2'])"/>
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="eglibc.xml"
     54    href="glibc.xml"
    5555    xpointer="xpointer(//*[@os='e'])"/>
    5656
    5757    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="eglibc.xml"
     58    href="glibc.xml"
    5959    xpointer="xpointer(//*[@os='f'])"/>
    6060
    61     <para os="m1">Tell EGLIBC to install its 64-bit libraries into
     61    <para os="m1">Tell GLIBC to install its 64-bit libraries into
    6262    <filename class="directory">/lib64</filename>:</para>
    6363
    … …  
    6565
    6666    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    67     href="eglibc.xml"
     67    href="glibc.xml"
    6868    xpointer="xpointer(//*[@os='g'])"/>
    6969
    7070<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    71     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     71    ../glibc-&glibc-version;/configure --prefix=/usr \
    7272    --disable-profile --enable-kernel=2.6.32 \
    7373    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
    … …  
    8989
    9090    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    91     href="eglibc.xml"
     91    href="glibc.xml"
    9292    xpointer="xpointer(//*[@os='j'])"/>
    9393
    9494    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    95     href="eglibc.xml"
     95    href="glibc.xml"
    9696    xpointer="xpointer(//*[@os='k'])"/>
    9797
    9898    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    99     href="eglibc.xml"
     99    href="glibc.xml"
    100100    xpointer="xpointer(//*[@os='l'])"/>
    101101
    102102    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    103     href="eglibc.xml"
     103    href="glibc.xml"
    104104    xpointer="xpointer(//*[@os='m'])"/>
    105105
    106106    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    107     href="eglibc.xml"
     107    href="glibc.xml"
    108108    xpointer="xpointer(//*[@os='n'])"/>
    109109
    110110    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    111     href="eglibc.xml"
     111    href="glibc.xml"
    112112    xpointer="xpointer(//*[@os='o'])"/>
    113113
    114114    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    115     href="../common/eglibc.xml"
     115    href="../common/glibc.xml"
    116116    xpointer="xpointer(//*[@os='p'])"/>
    117117
    118118    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    119     href="eglibc.xml"
     119    href="glibc.xml"
    120120    xpointer="xpointer(//*[@os='s'])"/>
    121121
    122122    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    123     href="eglibc.xml"
     123    href="glibc.xml"
    124124    xpointer="xpointer(//*[@os='t'])"/>
     125
     126    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     127    href="../common/glibc.xml"
     128    xpointer="xpointer(//*[@os='u'])"/>
     129
     130    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     131    href="../common/glibc.xml"
     132    xpointer="xpointer(//*[@os='v'])"/>
     133
     134    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     135    href="../common/glibc.xml"
     136    xpointer="xpointer(//*[@os='w'])"/>
     137
     138    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     139    href="../common/glibc.xml"
     140    xpointer="xpointer(//*[@os='x'])"/>
    125141
    126142  </sect2>
    127143
    128144  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    129   href="../common/eglibc.xml"
    130   xpointer="xpointer(id('i18n-eglibc'))"/>
     145  href="../common/glibc.xml"
     146  xpointer="xpointer(id('i18n-glibc'))"/>
    131147
    132148  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    133   href="../common/eglibc.xml"
    134   xpointer="xpointer(id('conf-eglibc'))"/>
     149  href="../common/glibc.xml"
     150  xpointer="xpointer(id('conf-glibc'))"/>
    135151
    136152  <sect2 id="conf-ld" role="configuration">
    … …  
    177193
    178194  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    179   href="../common/eglibc.xml"
    180   xpointer="xpointer(id('contents-eglibc'))"/>
     195  href="../common/glibc.xml"
     196  xpointer="xpointer(id('contents-glibc'))"/>
    181197
    182198</sect1>

  • BOOK/final-system/multilib/glibc.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-eglibc-32" role="wrap">
    9   <?dbhtml filename="eglibc.html"?>
     8<sect1 id="ch-system-glibc-32" role="wrap">
     9  <?dbhtml filename="glibc.html"?>
    1010
    11   <title>EGLIBC-&eglibc-version; 32 Bit Libraries</title>
     11  <title>GLIBC-&glibc-version; 32 Bit Libraries</title>
    1212
    13   <indexterm zone="ch-system-eglibc-32">
    14     <primary sortas="a-EGLIBC">EGLIBC</primary>
     13  <indexterm zone="ch-system-glibc-32">
     14    <primary sortas="a-GLIBC">GLIBC</primary>
    1515    <secondary>32 Bit</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/eglibc.xml"
     19  href="../common/glibc.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of EGLIBC</title>
     23    <title>Installation of GLIBC</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/eglibc.xml"
     26    href="../common/glibc.xml"
    2727    xpointer="xpointer(//*[@os='z'])"/>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/eglibc.xml"
     30    href="../common/glibc.xml"
    3131    xpointer="xpointer(//*[@os='l1'])"/>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/eglibc.xml"
     34    href="../common/glibc.xml"
    3535    xpointer="xpointer(//*[@os='l2'])"/>
    3636
    3737    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../common/eglibc.xml"
     38    href="../common/glibc.xml"
    3939    xpointer="xpointer(//*[@os='l3'])"/>
    4040
    4141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../common/eglibc.xml"
     42    href="../common/glibc.xml"
    4343    xpointer="xpointer(//*[@os='l4'])"/>
    4444
    4545    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    46     href="../common/eglibc.xml"
     46    href="../common/glibc.xml"
    4747    xpointer="xpointer(//*[@os='b'])"/>
    4848
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/eglibc.xml"
     50    href="../common/glibc.xml"
    5151    xpointer="xpointer(//*[@os='s1'])"/>
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="../common/eglibc.xml"
     54    href="../common/glibc.xml"
    5555    xpointer="xpointer(//*[@os='s2'])"/>
    5656
    5757    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="../common/eglibc.xml"
     58    href="../common/glibc.xml"
    5959    xpointer="xpointer(//*[@os='e'])"/>
    6060
    6161    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    62     href="../common/eglibc.xml"
     62    href="../common/glibc.xml"
    6363    xpointer="xpointer(//*[@os='f'])"/>
    6464
    6565    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    66     href="../common/eglibc.xml"
     66    href="../common/glibc.xml"
    6767    xpointer="xpointer(//*[@os='g'])"/>
    6868
    6969<screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    70     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     70    ../glibc-&glibc-version;/configure --prefix=/usr \
    7171    --disable-profile --enable-kernel=2.6.32 \
    72     --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32} \
     72    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32} \
    7373    --enable-obsolete-rpc</userinput></screen>
    7474
    7575    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    76     href="../common/eglibc.xml"
     76    href="../common/glibc.xml"
    7777    xpointer="xpointer(//*[@os='i'])"/>
    7878
    7979    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    80     href="../common/eglibc.xml"
     80    href="../common/glibc.xml"
    8181    xpointer="xpointer(//*[@os='j'])"/>
    8282
    8383    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    84     href="../common/eglibc.xml"
     84    href="../common/glibc.xml"
    8585    xpointer="xpointer(//*[@os='k'])"/>
    8686
    8787    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    88     href="../common/eglibc.xml"
     88    href="../common/glibc.xml"
    8989    xpointer="xpointer(//*[@os='l'])"/>
    9090
    9191    <para os="l1b">In multilib, we tend to think that compiling for
    9292    <literal>${CLFS_TARGET32}</literal> is <emphasis>not</emphasis>
    93     cross-compiling. EGLIBC takes the traditional view that if you are building
     93    cross-compiling. GLIBC takes the traditional view that if you are building
    9494    for a different host then you are cross-compiling, so you won't be running
    9595    the tests and therefore you don't need the locale files. When we run
    … …  
    9797    sed allows these tests to succeed:</para>
    9898
    99 <screen os="l2b"><userinput>sed -i '/cross-compiling/s@ifeq@ifneq@g' ../eglibc-&eglibc-version;/localedata/Makefile</userinput></screen>
     99<screen os="l2b"><userinput>sed -i '/cross-compiling/s@ifeq@ifneq@g' ../glibc-&glibc-version;/localedata/Makefile</userinput></screen>
    100100
    101101    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    102     href="../common/eglibc.xml"
     102    href="../common/glibc.xml"
    103103    xpointer="xpointer(//*[@os='m'])"/>
    104104
    105105    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    106     href="../common/eglibc.xml"
     106    href="../common/glibc.xml"
    107107    xpointer="xpointer(//*[@os='n'])"/>
    108108
    109109    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    110     href="../common/eglibc.xml"
     110    href="../common/glibc.xml"
    111111    xpointer="xpointer(//*[@os='o'])"/>
    112112
    113113    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    114     href="../common/eglibc.xml"
     114    href="../common/glibc.xml"
    115115    xpointer="xpointer(//*[@os='p'])"/>
    116116
    117117    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    118     href="../common/eglibc.xml"
     118    href="../common/glibc.xml"
    119119    xpointer="xpointer(//*[@os='q'])"/>
    120120
    121121    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    122     href="../common/eglibc.xml"
     122    href="../common/glibc.xml"
    123123    xpointer="xpointer(//*[@os='r'])"/>
    124124
    125125    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    126     href="../common/eglibc.xml"
     126    href="../common/glibc.xml"
    127127    xpointer="xpointer(//*[@os='s'])"/>
    128128
    129129    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    130     href="../common/eglibc.xml"
     130    href="../common/glibc.xml"
    131131    xpointer="xpointer(//*[@os='t'])"/>
    132132
    … …  
    137137
    138138    <para>Details on this package are located in <xref
    139     linkend="contents-eglibc" role="."/></para>
     139    linkend="contents-glibc" role="."/></para>
    140140
    141141  </sect2>

  • BOOK/final-system/multilib/gmp-64bit.xml

    r88ef769 r03e6a40  
    7474    xpointer="xpointer(//*[@os='i'])"/>
    7575
     76    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     77    href="../common/gmp.xml"
     78    xpointer="xpointer(//*[@os='j'])"/>
     79
     80    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     81    href="../common/gmp.xml"
     82    xpointer="xpointer(//*[@os='k'])"/>
     83
    7684    <para os="j">Create the 64bit header file:</para>
    7785

  • BOOK/final-system/multilib/gzip.xml

    r88ef769 r03e6a40  
    4040    xpointer="xpointer(//*[@os='e'])"/>
    4141
    42     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    43     href="../common/gzip.xml"
    44     xpointer="xpointer(//*[@os='e2'])"/>
     42<screen><userinput remap="test">make PERL=perl-64 check</userinput></screen>
    4543
    4644    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/iproute2.xml

    r88ef769 r03e6a40  
    4646    xpointer="xpointer(//*[@os='a'])"/>
    4747
    48 <screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= LIBDIR=/usr/lib64 \
    49     DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</userinput></screen>
     48<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= \
     49    LIBDIR=/usr/lib64 MANDIR=/usr/share/man</userinput></screen>
    5050
    5151    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6262
    6363<screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \
    64     DOCDIR=/usr/share/doc/iproute2 \
     64    DOCDIR=/usr/share/doc/iproute2-&iproute2-version; \
    6565    MANDIR=/usr/share/man install</userinput></screen>
    6666

  • BOOK/final-system/multilib/iputils.xml

    r88ef769 r03e6a40  
    3434    xpointer="xpointer(//*[@os='a'])"/>
    3535
    36 <screen os="b"><userinput>make USE_CAP=no CC="gcc ${BUILD64}" \
     36<screen os="b"><userinput>make CC="gcc ${BUILD64}" \
    3737    IPV4_TARGETS="tracepath ping clockdiff rdisc" \
    3838    IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>

  • BOOK/final-system/multilib/kbd.xml

    r88ef769 r03e6a40  
    5555    xpointer="xpointer(//*[@os='i'])"/>
    5656
     57    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     58    href="../common/kbd.xml"
     59    xpointer="xpointer(//*[@os='j'])"/>
     60
     61    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     62    href="../common/kbd.xml"
     63    xpointer="xpointer(//*[@os='k'])"/>
     64
    5765  </sect2>
    5866

  • BOOK/final-system/multilib/kmod-64bit.xml

    r88ef769 r03e6a40  
    2727
    2828<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} CC="gcc ${BUILD64}" \
    29         ./configure --prefix=/usr \
    30         --bindir=/bin --sysconfdir=/etc \
    31         --with-rootlibdir=/lib64 --libdir=/usr/lib64 \
    32         --with-zlib --with-xz --disable-manpages</userinput></screen>
     29  ./configure --prefix=/usr \
     30    --bindir=/bin --sysconfdir=/etc \
     31    --with-rootlibdir=/lib64 --libdir=/usr/lib64 \
     32    --with-zlib --with-xz</userinput></screen>
    3333
    3434    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/kmod-n32.xml

    r88ef769 r03e6a40  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29     <screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
    30             ./configure --prefix=/usr \
    31             --bindir=/bin --sysconfdir=/etc \
    32             --with-rootlibdir=/lib32 --libdir=/usr/lib32 \
    33             --with-zlib --with-xz --disable-manpages</userinput></screen>
     29<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
     30  ./configure --prefix=/usr \
     31    --bindir=/bin --sysconfdir=/etc \
     32    --with-rootlibdir=/lib32 --libdir=/usr/lib32 \
     33    --with-zlib --with-xz</userinput></screen>
    3434
    3535    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/kmod.xml

    r88ef769 r03e6a40  
    2828
    2929<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} CC="gcc ${BUILD32}" \
    30         ./configure --prefix=/usr \
    31         --bindir=/bin --sysconfdir=/etc \
    32         --with-rootlibdir=/lib --libdir=/usr/lib \
    33         --with-zlib --with-xz --disable-manpages</userinput></screen>
     30  ./configure --prefix=/usr \
     31    --bindir=/bin --sysconfdir=/etc \
     32    --with-rootlibdir=/lib --libdir=/usr/lib \
     33    --with-zlib --with-xz</userinput></screen>
    3434
    3535    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/mpfr-64bit.xml

    r88ef769 r03e6a40  
    3636<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    3737LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
    38   ./configure --prefix=/usr --libdir=/usr/lib64 --enable-shared</userinput></screen>
     38  ./configure --prefix=/usr --libdir=/usr/lib64 \
     39  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
    3940
    4041    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/mpfr-n32.xml

    r88ef769 r03e6a40  
    3737<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
    3838LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
    39   ./configure --prefix=/usr --libdir=/usr/lib32 --enable-shared</userinput></screen>
     39  ./configure --prefix=/usr --libdir=/usr/lib32 \
     40  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
    4041
    4142    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/mpfr.xml

    r88ef769 r03e6a40  
    3737<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
    3838LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
    39   ./configure --prefix=/usr --host=${CLFS_TARGET32} --enable-shared</userinput></screen>
     39  ./configure --prefix=/usr --host=${CLFS_TARGET32} \
     40  --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
    4041
    4142    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/ncurses-64bit.xml

    r88ef769 r03e6a40  
    7474    <para os="j">Create symlinks in <filename class="directory">/usr/lib64:</filename></para>
    7575
    76 <screen os="k"><userinput>rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so
    77 ln -svf ../../lib64/libncursesw.so.5 /usr/lib64/libncursesw.so
    78 ln -svf ../../lib64/libmenuw.so.5 /usr/lib64/libmenuw.so
    79 ln -svf ../../lib64/libpanelw.so.5 /usr/lib64/libpanelw.so
    80 ln -svf ../../lib64/libformw.so.5 /usr/lib64/libformw.so</userinput></screen>
     76<screen os="k"><userinput>
     77ln -svf ../../lib64/$(readlink /lib64/libncursesw.so) /usr/lib64/libncursesw.so
     78ln -svf ../../lib64/$(readlink /lib64/libmenuw.so) /usr/lib64/libmenuw.so
     79ln -svf ../../lib64/$(readlink /lib64/libpanelw.so) /usr/lib64/libpanelw.so
     80ln -svf ../../lib64/$(readlink /lib64/libformw.so) /usr/lib64/libformw.so
     81rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so
     82</userinput></screen>
    8183
    8284    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    9698ln -sfv ncursesw5-config /usr/bin/ncurses5-config</userinput></screen>
    9799
    98     <para os="n">Now we will create a symlink for /usr/share/terminfo in
    99     <filename class="directory">/usr/lib64</filename> for compatibility:</para>
    100 
    101 <screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib64/terminfo</userinput></screen>
    102 
    103100  </sect2>
    104101

  • BOOK/final-system/multilib/ncurses-n32.xml

    r88ef769 r03e6a40  
    7474    <para os="j">Create symlinks in <filename class="directory">/usr/lib32:</filename></para>
    7575
    76 <screen os="k"><userinput>rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so
    77 ln -svf ../../lib32/libncursesw.so.5 /usr/lib32/libncursesw.so
    78 ln -svf ../../lib32/libmenuw.so.5 /usr/lib32/libmenuw.so
    79 ln -svf ../../lib32/libpanelw.so.5 /usr/lib32/libpanelw.so
    80 ln -svf ../../lib32/libformw.so.5 /usr/lib32/libformw.so</userinput></screen>
     76<screen os="k"><userinput>
     77ln -svf ../../lib32/$(readlink /lib32/libncursesw.so) /usr/lib32/libncursesw.so
     78ln -svf ../../lib32/$(readlink /lib32/libmenuw.so) /usr/lib32/libmenuw.so
     79ln -svf ../../lib32/$(readlink /lib32/libpanelw.so) /usr/lib32/libpanelw.so
     80ln -svf ../../lib32/$(readlink /lib32/libformw.so) /usr/lib32/libformw.so
     81rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so
     82</userinput></screen>
    8183
    8284    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    9597ln -sfv ncurses5w-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
    9698
    97     <para os="n">Now we will create a symlink for /usr/share/terminfo in
    98     <filename class="directory">/usr/lib32</filename> for compatibility:</para>
    99 
    100 <screen os="o"><userinput>ln -sfv ../share/terminfo /usr/lib32/terminfo</userinput></screen>
    101 
    10299  </sect2>
    103100

  • BOOK/final-system/multilib/ncurses.xml

    r88ef769 r03e6a40  
    9797ln -sfv ncursesw5-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
    9898
    99     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    100     href="../common/ncurses.xml"
    101     xpointer="xpointer(//*[@os='n'])"/>
    102 
    103     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    104     href="../common/ncurses.xml"
    105     xpointer="xpointer(//*[@os='o'])"/>
    106 
    10799  </sect2>
    108100

  • BOOK/final-system/multilib/perl.xml

    r88ef769 r03e6a40  
    4242    href="../common/perl.xml"
    4343    xpointer="xpointer(//*[@os='a02'])"/>
    44 
    45     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    46     href="../common/perl.xml"
    47     xpointer="xpointer(//*[@os='a03'])"/>
    4844
    4945    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/procps-ng-64bit.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-rsyslog" xreflabel="rsyslog" role="wrap">
    9   <?dbhtml filename="rsyslog.html"?>
     8<sect1 id="ch-system-procps-ng" role="wrap">
     9  <?dbhtml filename="procps-ng-64bit.html"?>
    1010
    11   <title>Rsyslog-&rsyslog-version;</title>
     11  <title>Procps-ng-&procps-ng-version; 64 Bit</title>
    1212
    13   <indexterm zone="ch-system-rsyslog">
    14     <primary sortas="a-rsyslog">rsyslog</primary>
     13  <indexterm zone="ch-system-procps-ng">
     14    <primary sortas="a-Procps-ng">Procps-ng</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="../common/rsyslog.xml"
     18  href="../common/procps-ng.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of Rsyslog</title>
     22    <title>Installation of Procps-ng</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/rsyslog.xml"
     25    href="../common/procps-ng.xml"
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
    29   ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --exec-prefix= \
     29    --libdir=/usr/lib64 --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
     30    --disable-kill</userinput></screen>
    3031
    3132    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    32     href="../common/rsyslog.xml"
     33    href="../common/procps-ng.xml"
    3334    xpointer="xpointer(//*[@os='c'])"/>
    3435
    3536    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/rsyslog.xml"
     37    href="../common/procps-ng.xml"
    3738    xpointer="xpointer(//*[@os='d'])"/>
    3839
    3940    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/rsyslog.xml"
     41    href="../common/procps-ng.xml"
    4142    xpointer="xpointer(//*[@os='e'])"/>
    4243
    4344    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/rsyslog.xml"
    45     xpointer="xpointer(//*[@os='e2'])"/>
    46 
    47     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/rsyslog.xml"
     45    href="../common/procps-ng.xml"
    4946    xpointer="xpointer(//*[@os='f'])"/>
    5047
    5148    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../common/rsyslog.xml"
     49    href="../common/procps-ng.xml"
    5350    xpointer="xpointer(//*[@os='g'])"/>
    5451
    5552    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    56     href="../common/rsyslog.xml"
     53    href="../common/procps-ng.xml"
    5754    xpointer="xpointer(//*[@os='h'])"/>
    5855
    5956    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    60     href="../common/rsyslog.xml"
     57    href="../common/procps-ng.xml"
    6158    xpointer="xpointer(//*[@os='i'])"/>
     59
     60    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     61    href="../multilib/procps-ng.xml"
     62    xpointer="xpointer(//*[@os='j'])"/>
     63
     64<screen os="k"><userinput>mv -v /usr/bin/pidof /bin
     65mv -v /usr/lib64/libprocps.so.* /lib64
     66ln -sfv ../../lib64/$(readlink /usr/lib64/libprocps.so) /usr/lib64/libprocps.so</userinput></screen>
    6267
    6368  </sect2>
    6469
    6570  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    66   href="../common/rsyslog.xml"
    67   xpointer="xpointer(id('conf-rsyslog'))"/>
    68 
    69   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70   href="../common/rsyslog.xml"
    71   xpointer="xpointer(id('contents-rsyslog'))"/>
     71  href="../common/procps-ng.xml"
     72  xpointer="xpointer(id('contents-procps-ng'))"/>
    7273
    7374</sect1>

  • BOOK/final-system/multilib/psmisc.xml

    r88ef769 r03e6a40  
    6161    xpointer="xpointer(//*[@os='j'])"/>
    6262
    63     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    64     href="../common/psmisc.xml"
    65     xpointer="xpointer(//*[@os='k'])"/>
    66 
    67     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    68     href="../common/psmisc.xml"
    69     xpointer="xpointer(//*[@os='l'])"/>
    70 
    7163  </sect2>
    7264

  • BOOK/final-system/multilib/readline-64bit.xml

    r88ef769 r03e6a40  
    6161    xpointer="xpointer(//*[@os='h'])"/>
    6262
    63     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    64     href="readline.xml"
    65     xpointer="xpointer(//*[@os='i'])"/>
     63<screen os="i"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
    6664
    67     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    68     href="readline.xml"
    69     xpointer="xpointer(//*[@os='j'])"/>
     65    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib64</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib64</filename>.</para>
    7066
    71 <screen os="k"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
    72 
    73     <para os="l">Next, remove the <filename class="extension">.so</filename>
    74     files in <filename class="directory">/lib64</filename> and relink them into
    75     <filename class="directory">/usr/lib64</filename>.</para>
    76 
    77 <screen os="m"><userinput>rm -v /lib64/lib{readline,history}.so
    78 ln -svf ../../lib64/libreadline.so.&readline-version2; /usr/lib64/libreadline.so
    79 ln -svf ../../lib64/libhistory.so.&readline-version2; /usr/lib64/libhistory.so</userinput></screen>
     67<screen os="k"><userinput>ln -svf ../../lib64/$(readlink /lib64/libreadline.so) /usr/lib64/libreadline.so
     68ln -svf ../../lib64/$(readlink /lib64/libhistory.so) /usr/lib64/libhistory.so
     69rm -v /lib64/lib{readline,history}.so</userinput></screen>
    8070
    8171  </sect2>

  • BOOK/final-system/multilib/readline-n32.xml

    r88ef769 r03e6a40  
    6262    xpointer="xpointer(//*[@os='h'])"/>
    6363
    64     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    65     href="readline.xml"
    66     xpointer="xpointer(//*[@os='i'])"/>
     64<screen os="i"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
    6765
    68     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    69     href="readline.xml"
    70     xpointer="xpointer(//*[@os='j'])"/>
     66    <para os="j">Next, relink the dynamic libraries into <filename class="directory">/usr/lib32</filename> and remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib32</filename>.</para>
    7167
    72 <screen os="k"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
    73 
    74     <para os="l">Next, remove the <filename class="extension">.so</filename>
    75     files in <filename class="directory">/lib32</filename> and relink them into
    76     <filename class="directory">/usr/lib32</filename>.</para>
    77 
    78 <screen os="m"><userinput>rm -v /lib32/lib{readline,history}.so
    79 ln -svf ../../lib32/libreadline.so.&readline-version2; /usr/lib32/libreadline.so
    80 ln -svf ../../lib32/libhistory.so.&readline-version2; /usr/lib32/libhistory.so</userinput></screen>
     68<screen os="k"><userinput>ln -svf ../../lib32/$(readlink /lib32/libreadline.so) /usr/lib32/libreadline.so
     69ln -svf ../../lib32/$(readlink /lib32/libhistory.so) /usr/lib32/libhistory.so
     70rm -v /lib32/lib{readline,history}.so</userinput></screen>
    8171
    8272  </sect2>

  • BOOK/final-system/multilib/readline.xml

    r88ef769 r03e6a40  
    7474    xpointer="xpointer(//*[@os='k'])"/>
    7575
    76     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    77     href="../common/readline.xml"
    78     xpointer="xpointer(//*[@os='l'])"/>
    79 
    80     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    81     href="../common/readline.xml"
    82     xpointer="xpointer(//*[@os='m'])"/>
    83 
    8476  </sect2>
    8577

  • BOOK/final-system/multilib/sed.xml

    r88ef769 r03e6a40  
    2727
    2828<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    29    --bindir=/bin</userinput></screen>
     29   --bindir=/bin --docdir=/usr/share/doc/sed-&sed-version;</userinput></screen>
    3030
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/tar.xml

    r88ef769 r03e6a40  
    7070    xpointer="xpointer(//*[@os='i'])"/>
    7171
     72    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     73    href="../common/tar.xml"
     74    xpointer="xpointer(//*[@os='j'])"/>
     75
     76    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     77    href="../common/tar.xml"
     78    xpointer="xpointer(//*[@os='k'])"/>
     79
    7280  </sect2>
    7381

  • BOOK/final-system/multilib/temp-perl.xml

    r88ef769 r03e6a40  
    6969    xpointer="xpointer(//*[@os='j'])"/>
    7070
    71     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    72     href="../common/temp-perl.xml"
    73     xpointer="xpointer(//*[@os='k'])"/>
    74 
    75     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    76     href="../common/temp-perl.xml"
    77     xpointer="xpointer(//*[@os='l'])"/>
    78 
    7971  </sect2>
    8072

  • BOOK/final-system/multilib/util-linux-64bit.xml

    r88ef769 r03e6a40  
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2929    href="../common/util-linux.xml"
     30    xpointer="xpointer(//*[@os='n'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/util-linux.xml"
    3034    xpointer="xpointer(//*[@os='a'])"/>
    3135
    3236<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
    33     --enable-write</userinput></screen>
     37    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
    3438
    3539    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6165    xpointer="xpointer(//*[@os='h'])"/>
    6266
    63     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    64     href="../common/util-linux.xml"
    65     xpointer="xpointer(//*[@os='i'])"/>
    66 
    67     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    68     href="../common/util-linux.xml"
    69     xpointer="xpointer(//*[@os='j'])"/>
    70 
    7167  </sect2>
    7268

  • BOOK/final-system/multilib/util-linux-n32.xml

    r88ef769 r03e6a40  
    2828
    2929<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
    30     --enable-write</userinput></screen>
     30    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    5858    xpointer="xpointer(//*[@os='h'])"/>
    5959
    60     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    61     href="../common/util-linux.xml"
    62     xpointer="xpointer(//*[@os='i'])"/>
    63 
    64     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    65     href="../common/util-linux.xml"
    66     xpointer="xpointer(//*[@os='j'])"/>
    67 
    6860  </sect2>
    6961

  • BOOK/final-system/multilib/util-linux.xml

    r88ef769 r03e6a40  
    2828
    2929<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
    30     --enable-write</userinput></screen>
     30    --enable-write --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4141    href="../common/util-linux.xml"
    4242    xpointer="xpointer(//*[@os='e'])"/>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/util-linux.xml"
    46     xpointer="xpointer(//*[@os='dummy1'])"/>
    47 
    48     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/util-linux.xml"
    50     xpointer="xpointer(//*[@os='dummy2'])"/>
    5143
    5244    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/vim.xml

    r88ef769 r03e6a40  
    5252    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5353    href="../common/vim.xml"
    54     xpointer="xpointer(//*[@os='f'])"/>
    55 
    56     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    57     href="../common/vim.xml"
    5854    xpointer="xpointer(//*[@os='g'])"/>
    5955
    … …  
    9490    xpointer="xpointer(//*[@os='n'])"/>
    9591
    96     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    97     href="../common/vim.xml"
    98     xpointer="xpointer(//*[@os='o'])"/>
    99 
    100     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    101     href="../common/vim.xml"
    102     xpointer="xpointer(//*[@os='p'])"/>
    103 
    10492  </sect2>
    10593

  • BOOK/final-system/multilib/xml-parser-64bit.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-libee" role="wrap">
    9   <?dbhtml filename="libee-64bit.html"?>
     8<sect1 id="ch-system-xml-parser" role="wrap">
     9  <?dbhtml filename="xml-parser-64bit.html"?>
    1010
    11   <title>Libee-&libee-version; 64 Bit</title>
     11  <title>XML-Parser-&xml-parser-version; 64 Bit</title>
    1212
    13   <indexterm zone="ch-system-libee">
    14     <primary sortas="a-Libee">Libee</primary>
     13  <indexterm zone="ch-system-xml-parser">
     14    <primary sortas="a-XML-Parser">XML::Parser</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="../common/libee.xml"
     18  href="../common/xml-parser.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of Libee</title>
     22    <title>Installation of XML-Parser</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/libee.xml"
     25    href="../common/xml-parser.xml"
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
    29   ./configure --prefix=/usr \
    30     --libdir=/usr/lib64</userinput></screen>
     28<screen os="b"><userinput>USE_ARCH=64 perl Makefile.PL</userinput></screen>
    3129
    3230    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/libee.xml"
     31    href="../common/xml-parser.xml"
    3432    xpointer="xpointer(//*[@os='c'])"/>
    3533
    3634    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/libee.xml"
    38     xpointer="xpointer(//*[@os='n1'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/libee.xml"
     35    href="../common/xml-parser.xml"
    4236    xpointer="xpointer(//*[@os='d'])"/>
    4337
    4438    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/libee.xml"
     39    href="../common/xml-parser.xml"
    4640    xpointer="xpointer(//*[@os='e'])"/>
    4741
    4842    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/libee.xml"
     43    href="../common/xml-parser.xml"
    5044    xpointer="xpointer(//*[@os='f'])"/>
    5145
    5246    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="../common/libee.xml"
     47    href="../common/xml-parser.xml"
    5448    xpointer="xpointer(//*[@os='g'])"/>
     49
     50    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     51    href="../common/xml-parser.xml"
     52    xpointer="xpointer(//*[@os='h'])"/>
    5553
    5654  </sect2>
    5755
    5856  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    59   href="../common/libee.xml"
    60   xpointer="xpointer(id('contents-libee'))"/>
     57  href="../common/xml-parser.xml"
     58  xpointer="xpointer(id('contents-xml-parser'))"/>
    6159
    6260</sect1>

  • BOOK/final-system/multilib/xml-parser-n32.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-libee-n32" role="wrap">
    9   <?dbhtml filename="libee-n32.html"?>
     8<sect1 id="ch-system-xml-parser-n32" role="wrap">
     9  <?dbhtml filename="xml-parser-n32.html"?>
    1010
    11   <title>Libee-&libee-version; N32 Libraries</title>
     11  <title>XML-Parser-&xml-parser-version; N32</title>
    1212
    13   <indexterm zone="ch-system-libee-n32">
    14     <primary sortas="a-Libee">Libee</primary>
     13  <indexterm zone="ch-system-xml-parser-32">
     14    <primary sortas="a-XML-Parser">XML::Parser</primary>
    1515    <secondary>N32</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/libee.xml"
     19  href="../common/xml-parser.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of Libee</title>
     23    <title>Installation of XML-Parser</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/libee.xml"
     26    href="../common/xml-parser.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
    30   ./configure --prefix=/usr \
    31     --libdir=/usr/lib32</userinput></screen>
     29<screen os="b"><userinput>USE_ARCH=n32 perl Makefile.PL</userinput></screen>
    3230
    3331    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/libee.xml"
     32    href="../common/xml-parser.xml"
    3533    xpointer="xpointer(//*[@os='c'])"/>
    3634
    3735    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../common/libee.xml"
    39     xpointer="xpointer(//*[@os='n1'])"/>
    40 
    41     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../common/libee.xml"
     36    href="../common/xml-parser.xml"
    4337    xpointer="xpointer(//*[@os='d'])"/>
    4438
    4539    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    46     href="../common/libee.xml"
     40    href="../common/xml-parser.xml"
    4741    xpointer="xpointer(//*[@os='e'])"/>
    4842
    4943    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/libee.xml"
     44    href="../common/xml-parser.xml"
    5145    xpointer="xpointer(//*[@os='f'])"/>
    5246
    5347    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="../common/libee.xml"
     48    href="../common/xml-parser.xml"
    5549    xpointer="xpointer(//*[@os='g'])"/>
     50
     51    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     52    href="../common/xml-parser.xml"
     53    xpointer="xpointer(//*[@os='h'])"/>
    5654
    5755  </sect2>
    … …  
    6159
    6260    <para>Details on this package are located in <xref
    63     linkend="contents-libee" role="."/></para>
     61    linkend="contents-xml-parser" role="."/></para>
    6462
    6563  </sect2>
     64</sect1>
    6665
    67 </sect1>

  • BOOK/final-system/multilib/xml-parser.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-libee-32" role="wrap">
    9   <?dbhtml filename="libee.html"?>
     8<sect1 id="ch-system-xml-parser-32" role="wrap">
     9  <?dbhtml filename="xml-parser.html"?>
    1010
    11   <title>Libee-&libee-version; 32 Bit Libraries</title>
     11  <title>XML-Parser-&xml-parser-version; 32 Bit</title>
    1212
    13   <indexterm zone="ch-system-libee-32">
    14     <primary sortas="a-Libee">Libee</primary>
     13  <indexterm zone="ch-system-xml-parser-32">
     14    <primary sortas="a-XML-Parser">XML::Parser</primary>
    1515    <secondary>32 Bit</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/libee.xml"
     19  href="../common/xml-parser.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of Libee</title>
     23    <title>Installation of XML-Parser</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/libee.xml"
     26    href="../common/xml-parser.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
    30   ./configure --prefix=/usr</userinput></screen>
     29<screen os="b"><userinput>USE_ARCH=32 perl Makefile.PL</userinput></screen>
    3130
    3231    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/libee.xml"
     32    href="../common/xml-parser.xml"
    3433    xpointer="xpointer(//*[@os='c'])"/>
    3534
    3635    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/libee.xml"
    38     xpointer="xpointer(//*[@os='n1'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/libee.xml"
     36    href="../common/xml-parser.xml"
    4237    xpointer="xpointer(//*[@os='d'])"/>
    4338
    4439    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/libee.xml"
     40    href="../common/xml-parser.xml"
    4641    xpointer="xpointer(//*[@os='e'])"/>
    4742
    4843    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/libee.xml"
     44    href="../common/xml-parser.xml"
    5045    xpointer="xpointer(//*[@os='f'])"/>
    5146
    5247    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="../common/libee.xml"
     48    href="../common/xml-parser.xml"
    5449    xpointer="xpointer(//*[@os='g'])"/>
     50
     51    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     52    href="../common/xml-parser.xml"
     53    xpointer="xpointer(//*[@os='h'])"/>
    5554
    5655  </sect2>
    … …  
    6059
    6160    <para>Details on this package are located in <xref
    62     linkend="contents-libee" role="."/></para>
     61    linkend="contents-xml-parser" role="."/></para>
    6362
    6463  </sect2>
     64</sect1>
    6565
    66 </sect1>

  • BOOK/final-system/multilib/xz-64bit.xml

    r88ef769 r03e6a40  
    1212
    1313  <indexterm zone="ch-system-xz">
    14     <primary sortas="a-XZ-Utils">XZ-Utils</primary>
     14    <primary sortas="a-XZ Utils">XZ Utils</primary>
    1515  </indexterm>
    1616
    … …  
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of XZ-Utils</title>
     22    <title>Installation of XZ Utils</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     29    --libdir=/usr/lib64 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
    2930
    3031    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6566
    6667<screen os="k"><userinput>mv -v /usr/lib64/liblzma.so.* /lib64
    67 ln -svf ../../lib64/liblzma.so.&xz-version; /usr/lib64/liblzma.so</userinput></screen>
     68ln -sfv ../../lib64/$(readlink /usr/lib64/liblzma.so) /usr/lib64/liblzma.so</userinput></screen>
    6869
    6970  </sect2>

  • BOOK/final-system/multilib/xz-n32.xml

    r88ef769 r03e6a40  
    1212
    1313  <indexterm zone="ch-system-xz-n32">
    14     <primary sortas="a-XZ-Utils">XZ-Utils</primary>
     14    <primary sortas="a-XZ Utils">XZ Utils</primary>
    1515    <secondary>N32</secondary>
    1616  </indexterm>
    … …  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
     30    --libdir=/usr/lib32 --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
    3031
    3132    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    5657
    5758<screen os="k"><userinput>mv -v /usr/lib32/liblzma.so.* /lib32
    58 ln -svf ../../lib32/liblzma.so.&xz-version; /usr/lib32/liblzma.so</userinput></screen>
     59ln -sfv ../../lib32/$(readlink /usr/lib32/liblzma.so) /usr/lib32/liblzma.so</userinput></screen>
    5960
    6061  </sect2>

  • BOOK/final-system/multilib/xz.xml

    r88ef769 r03e6a40  
    1212
    1313  <indexterm zone="ch-system-xz-32">
    14     <primary sortas="a-XZ-Utils">XZ-Utils</primary>
     14    <primary sortas="a-XZ Utils">XZ Utils</primary>
    1515    <secondary>32 Bit</secondary>
    1616  </indexterm>
    … …  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
     30    --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
    3031
    3132    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/zlib-64bit.xml

    r88ef769 r03e6a40  
    6262
    6363<screen os="i"><userinput>mv -v /usr/lib64/libz.so.* /lib64
    64 ln -svf ../../lib64/libz.so.1 /usr/lib64/libz.so</userinput></screen>
     64ln -sfv ../../lib64/$(readlink /usr/lib64/libz.so) /usr/lib64/libz.so</userinput></screen>
    6565
    6666  </sect2>

  • BOOK/final-system/multilib/zlib-n32.xml

    r88ef769 r03e6a40  
    6363
    6464<screen os="i"><userinput>mv -v /usr/lib32/libz.so.* /lib32
    65 ln -svf ../../lib32/libz.so.1 /usr/lib32/libz.so</userinput></screen>
     65ln -sfv ../../lib32/$(readlink /usr/lib32/libz.so) /usr/lib32/libz.so</userinput></screen>
    6666
    6767  </sect2>
Note: See TracChangeset for help on using the changeset viewer.