Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (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 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

Location:
BOOK/final-system/multilib
Files:
3 added
2 deleted
71 edited
8 moved

Legend:

Unmodified
Added
Removed

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

    rec008670 r229ed25  
    4242    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4343    href="../common/autoconf.xml"
     44    xpointer="xpointer(//*[@os='e2'])"/>
     45
     46    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     47    href="../common/autoconf.xml"
     48    xpointer="xpointer(//*[@os='e3'])"/>
     49
     50    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     51    href="../common/autoconf.xml"
    4452    xpointer="xpointer(//*[@os='f'])"/>
    4553

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

    rec008670 r229ed25  
    4141
    4242    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     43    href="../common/automake.xml"
     44    xpointer="xpointer(//*[@os='e2'])"/>
     45
     46    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4347    href="../common/autoconf.xml"
    4448    xpointer="xpointer(//*[@os='f'])"/>

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

    rec008670 r229ed25  
    6161    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6262    href="../common/bash.xml"
     63    xpointer="xpointer(//*[@os='f2'])"/>
     64
     65    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     66    href="../common/bash.xml"
    6367    xpointer="xpointer(//*[@os='g'])"/>
    6468

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

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-glib" role="wrap">
    9   <?dbhtml filename="glib-64bit.html"?>
     8<sect1 id="ch-system-bc" role="wrap">
     9  <?dbhtml filename="bc.html"?>
    1010
    11   <title>Glib-&glib-version; 64Bit</title>
     11  <title>Bc-&bc-version;</title>
    1212
    13   <indexterm zone="ch-system-glib">
    14     <primary sortas="a-Glib">Glib</primary>
     13  <indexterm zone="ch-system-bc">
     14    <primary sortas="a-Bc">Bc</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="../common/glib.xml"
     18  href="../common/bc.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of Glib</title>
     22    <title>Installation of Bc</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/glib.xml"
     25    href="../common/bc.xml"
    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</userinput></screen>
    2929
    3030    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    31     href="../common/glib.xml"
     31    href="../common/bc.xml"
    3232    xpointer="xpointer(//*[@os='c'])"/>
    3333
    3434    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    35     href="../common/glib.xml"
     35    href="../common/bc.xml"
    3636    xpointer="xpointer(//*[@os='d'])"/>
    3737
    3838    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    39     href="../common/glib.xml"
     39    href="../common/bc.xml"
    4040    xpointer="xpointer(//*[@os='e'])"/>
    4141
    4242    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    43     href="../common/glib.xml"
     43    href="../common/bc.xml"
     44    xpointer="xpointer(//*[@os='e2'])"/>
     45
     46    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     47    href="../common/bc.xml"
    4448    xpointer="xpointer(//*[@os='f'])"/>
    4549
    4650    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    47     href="../common/glib.xml"
     51    href="../common/bc.xml"
    4852    xpointer="xpointer(//*[@os='g'])"/>
    4953
    … …  
    5155
    5256  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53   href="../common/glib.xml"
    54   xpointer="xpointer(id('contents-glib'))"/>
     57  href="../common/bc.xml"
     58  xpointer="xpointer(id('contents-bc'))"/>
    5559
    5660</sect1>

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

    rec008670 r229ed25  
    4242    xpointer="xpointer(//*[@os='f'])"/>
    4343
     44<!-- Branch update patch area
     45    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     46    href="../../final-system/common/binutils.xml"
     47    xpointer="xpointer(//*[@os='p1'])"/>
     48
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     50    href="../../final-system/common/binutils.xml"
     51    xpointer="xpointer(//*[@os='p2'])"/>
     52-->
    4453    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4554    href="../common/binutils.xml"
    … …  
    5665<screen os="ca"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    5766LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib ${BUILD64}" \
    58   ../binutils-&binutils-version;/configure --prefix=/usr \
     67  ../binutils-&binutils-dir;/configure --prefix=/usr \
    5968    --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64</userinput></screen>
    6069

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

    rec008670 r229ed25  
    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"
    2634    xpointer="xpointer(//*[@os='a'])"/>
    2735
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
     36<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64  --cache-file=config.cache</userinput></screen>
    2937
    3038    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    3947    href="../common/bison.xml"
    4048    xpointer="xpointer(//*[@os='e'])"/>
     49
     50    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     51    href="../common/bison.xml"
     52    xpointer="xpointer(//*[@os='e2'])"/>
    4153
    4254    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    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"
    2735    xpointer="xpointer(//*[@os='a'])"/>
    2836
    29 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
     37<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32  --cache-file=config.cache</userinput></screen>
    3038
    3139    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4048    href="../common/bison.xml"
    4149    xpointer="xpointer(//*[@os='e'])"/>
     50
     51    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     52    href="../common/bison.xml"
     53    xpointer="xpointer(//*[@os='e2'])"/>
    4254
    4355    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    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"
    2735    xpointer="xpointer(//*[@os='a'])"/>
    2836
    29 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
     37<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr  --cache-file=config.cache</userinput></screen>
    3038
    3139    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4048    href="../common/bison.xml"
    4149    xpointer="xpointer(//*[@os='e'])"/>
     50
     51    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     52    href="../common/bison.xml"
     53    xpointer="xpointer(//*[@os='e2'])"/>
    4254
    4355    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-ppl-n32" role="wrap">
    9   <?dbhtml filename="ppl-n32.html"?>
     8<sect1 id="ch-system-cloog-n32" role="wrap">
     9  <?dbhtml filename="cloog-n32.html"?>
    1010
    11   <title>PPL-&ppl-version; N32 Libraries</title>
     11  <title>CLooG-&cloog-version; N32 Libraries</title>
    1212
    13   <indexterm zone="ch-system-ppl-n32">
    14     <primary sortas="a-PPL">PPL</primary>
     13  <indexterm zone="ch-system-cloog-n32">
     14    <primary sortas="a-CLooG">CLooG</primary>
    1515    <secondary>N32</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/ppl.xml"
     19  href="../common/cloog.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of PPL</title>
     23    <title>Installation of CLooG</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/ppl.xml"
     26    href="../common/cloog.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILDN32}" \
    30 CXX="g++ -isystem /usr/include ${BUILDN32}" \
     29<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
    3130LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
    32   ./configure --prefix=/usr --libdir=/usr/lib32 \
    33     --enable-shared --disable-optimization</userinput></screen>
     31  ./configure --prefix=/usr \
     32    --libdir=/usr/lib32 --enable-shared --with-isl=system</userinput></screen>
    3433
    3534    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/ppl.xml"
     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'])"/>
     41
     42    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     43    href="../common/cloog.xml"
    3744    xpointer="xpointer(//*[@os='c'])"/>
    3845
    3946    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/ppl.xml"
     47    href="../common/cloog.xml"
    4148    xpointer="xpointer(//*[@os='d'])"/>
    4249
    4350    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/ppl.xml"
     51    href="../common/cloog.xml"
    4552    xpointer="xpointer(//*[@os='e'])"/>
    4653
    4754    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/ppl.xml"
     55    href="../common/cloog.xml"
    4956    xpointer="xpointer(//*[@os='f'])"/>
    5057
    5158    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../common/ppl.xml"
     59    href="../common/cloog.xml"
    5360    xpointer="xpointer(//*[@os='g'])"/>
    5461
    5562    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    56     href="../common/ppl.xml"
     63    href="../common/cloog.xml"
    5764    xpointer="xpointer(//*[@os='h'])"/>
    5865
    5966    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    60     href="../common/ppl.xml"
     67    href="../common/cloog.xml"
    6168    xpointer="xpointer(//*[@os='i'])"/>
    62 
    63     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    64     href="ppl.xml"
    65     xpointer="xpointer(//*[@os='m1'])"/>
    66 
    67 <screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-n32}</userinput></screen>
    68 
    69     <para os="j">Create the N32 header file:</para>
    70 
    71 <screen os="k"><userinput>mv -v /usr/include/ppl{,-n32}.hh</userinput></screen>
    7269
    7370  </sect2>
    … …  
    7774
    7875    <para>Details on this package are located in <xref
    79     linkend="contents-ppl" role="."/></para>
     76    linkend="contents-cloog" role="."/></para>
    8077
    8178  </sect2>

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

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-ppl-32" role="wrap">
    9   <?dbhtml filename="ppl.html"?>
     8<sect1 id="ch-system-cloog-32" role="wrap">
     9  <?dbhtml filename="cloog.html"?>
    1010
    11   <title>PPL-&ppl-version; 32 Bit Libraries</title>
     11  <title>CLooG-&cloog-version; 32 Bit Libraries</title>
    1212
    13   <indexterm zone="ch-system-ppl-32">
    14     <primary sortas="a-PPL">PPL</primary>
     13  <indexterm zone="ch-system-cloog-32">
     14    <primary sortas="a-CLooG">CLooG</primary>
    1515    <secondary>32 Bit</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/ppl.xml"
     19  href="../common/cloog.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of PPL</title>
     23    <title>Installation of CLooG</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/ppl.xml"
     26    href="../common/cloog.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD32}" \
    30 CXX="g++ -isystem /usr/include ${BUILD32}" \
     29<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
    3130LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
    32   ./configure --prefix=/usr --host=${CLFS_TARGET32} \
    33     --enable-shared --disable-optimization</userinput></screen>
     31  ./configure --prefix=/usr \
     32    --host=${CLFS_TARGET32} --enable-shared --with-isl=system</userinput></screen>
    3433
    3534    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/ppl.xml"
     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'])"/>
     41
     42    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     43    href="../common/cloog.xml"
    3744    xpointer="xpointer(//*[@os='c'])"/>
    3845
    3946    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/ppl.xml"
     47    href="../common/cloog.xml"
    4148    xpointer="xpointer(//*[@os='d'])"/>
    4249
    4350    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/ppl.xml"
     51    href="../common/cloog.xml"
    4552    xpointer="xpointer(//*[@os='e'])"/>
    4653
    4754    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/ppl.xml"
     55    href="../common/cloog.xml"
    4956    xpointer="xpointer(//*[@os='f'])"/>
    5057
    5158    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../common/ppl.xml"
     59    href="../common/cloog.xml"
    5360    xpointer="xpointer(//*[@os='g'])"/>
    5461
    5562    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    56     href="../common/ppl.xml"
     63    href="../common/cloog.xml"
    5764    xpointer="xpointer(//*[@os='h'])"/>
    5865
    5966    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    60     href="../common/ppl.xml"
     67    href="../common/cloog.xml"
    6168    xpointer="xpointer(//*[@os='i'])"/>
    62 
    63     <para os="m1">Prepare <filename>ppl-config</filename> to be wrapped by
    64     the multiarch wrapper:</para>
    65 
    66 <screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-32}</userinput></screen>
    67 
    68     <para os="j">One of the headers installed by PPL is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of PPL. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
    69 
    70 <screen os="k"><userinput>mv -v /usr/include/ppl{,-32}.hh</userinput></screen>
    71 
    7269
    7370  </sect2>
    … …  
    7774
    7875    <para>Details on this package are located in <xref
    79     linkend="contents-ppl" role="."/></para>
     76    linkend="contents-cloog" role="."/></para>
    8077
    8178  </sect2>

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

    rec008670 r229ed25  
    3434    xpointer="xpointer(//*[@os='c'])"/>
    3535
    36 <screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     36<screen os="d"><userinput>FORCE_UNSAFE_CONFIGURE=1 CC="gcc ${BUILD64}" \
     37   ./configure --prefix=/usr \
    3738    --enable-no-install-program=kill,uptime \
    3839    --enable-install-program=hostname</userinput></screen>
     40   
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     42    href="../common/coreutils.xml"
     43    xpointer="xpointer(//*[@os='d1'])"/>
    3944
    4045    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    5050    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5151    href="../common/diffutils.xml"
     52    xpointer="xpointer(//*[@os='e2'])"/>
     53
     54    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     55    href="../common/diffutils.xml"
    5256    xpointer="xpointer(//*[@os='f'])"/>
    5357

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

    rec008670 r229ed25  
    6363    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6464    href="../common/e2fsprogs.xml"
     65    xpointer="xpointer(//*[@os='h2'])"/>
     66
     67    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     68    href="../common/e2fsprogs.xml"
    6569    xpointer="xpointer(//*[@os='i'])"/>
    6670

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

    rec008670 r229ed25  
    4040
    4141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../common/eglibc.xml"
    43     xpointer="xpointer(//*[@os='p1'])"/>
     42    href="eglibc.xml"
     43    xpointer="xpointer(//*[@os='b'])"/>
    4444
    4545    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4646    href="../common/eglibc.xml"
    47     xpointer="xpointer(//*[@os='p2'])"/>
     47    xpointer="xpointer(//*[@os='s1'])"/>
    4848
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="eglibc.xml"
    51     xpointer="xpointer(//*[@os='b'])"/>
     50    href="../common/eglibc.xml"
     51    xpointer="xpointer(//*[@os='s2'])"/>
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    7070<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    7171    ../eglibc-&eglibc-version;/configure --prefix=/usr \
    72     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
    73     --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64</userinput></screen>
     72    --disable-profile --enable-kernel=2.6.32 \
     73    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
     74    --enable-obsolete-rpc</userinput></screen>
    7475
    7576    <variablelist os="i">
    … …  
    7980        <term><parameter>--libexecdir=/usr/lib64/glibc</parameter></term>
    8081        <listitem>
    81           <para>This changes the location of the <command>pt_chown</command>
    82           program from its default of <filename
     82          <para>This changes the location of the <command>getconf</command>
     83          utility from its default of <filename
    8384          class="directory">/usr/libexec</filename> to <filename
    8485          class="directory">/usr/lib64/glibc</filename>.</para>

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

    rec008670 r229ed25  
    4545    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4646    href="../common/eglibc.xml"
    47     xpointer="xpointer(//*[@os='p1'])"/>
     47    xpointer="xpointer(//*[@os='b'])"/>
    4848
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5050    href="../common/eglibc.xml"
    51     xpointer="xpointer(//*[@os='p2'])"/>
     51    xpointer="xpointer(//*[@os='s1'])"/>
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5454    href="../common/eglibc.xml"
    55     xpointer="xpointer(//*[@os='b'])"/>
     55    xpointer="xpointer(//*[@os='s2'])"/>
    5656
    5757    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6969<screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    7070    ../eglibc-&eglibc-version;/configure --prefix=/usr \
    71     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
    72     --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32}</userinput></screen>
     71    --disable-profile --enable-kernel=2.6.32 \
     72    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32} \
     73    --enable-obsolete-rpc</userinput></screen>
    7374
    7475    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    8889    xpointer="xpointer(//*[@os='l'])"/>
    8990
    90     <para os="l1">In multilib, we tend to think that compiling for
     91    <para os="l1b">In multilib, we tend to think that compiling for
    9192    <literal>${CLFS_TARGET32}</literal> is <emphasis>not</emphasis>
    9293    cross-compiling. EGLIBC takes the traditional view that if you are building
    … …  
    9697    sed allows these tests to succeed:</para>
    9798
    98 <screen os="l2"><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' ../eglibc-&eglibc-version;/localedata/Makefile</userinput></screen>
    99100
    100101    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    4343  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4444    href="file.xml"
     45    xpointer="xpointer(//*[@os='e2'])"/>
     46
     47  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     48    href="file.xml"
    4549    xpointer="xpointer(//*[@os='f'])"/>
    4650

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

    rec008670 r229ed25  
    4242    xpointer="xpointer(//*[@os='e'])"/>
    4343
     44  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="file.xml"
     46    xpointer="xpointer(//*[@os='e2'])"/>
     47
    4448    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4549    href="file.xml"

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

    rec008670 r229ed25  
    4343  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4444    href="../common/file.xml"
     45    xpointer="xpointer(//*[@os='e2'])"/>
     46
     47  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     48    href="../common/file.xml"
    4549    xpointer="xpointer(//*[@os='f'])"/>
    4650

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

    rec008670 r229ed25  
    5454    href="../common/findutils.xml"
    5555    xpointer="xpointer(//*[@os='f'])"/>
     56
     57    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     58    href="../common/findutils.xml"
     59    xpointer="xpointer(//*[@os='f2'])"/>
    5660
    5761    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="flex.xml"
    26     xpointer="xpointer(//*[@os='p1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="flex.xml"
    30     xpointer="xpointer(//*[@os='p2'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="flex.xml"
    3426    xpointer="xpointer(//*[@os='a'])"/>
    3527
    … …  
    4840    href="../common/flex.xml"
    4941    xpointer="xpointer(//*[@os='e'])"/>
     42
     43    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     44    href="../common/flex.xml"
     45    xpointer="xpointer(//*[@os='e2'])"/>
    5046
    5147    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    2121  <sect2 role="installation">
    2222    <title>Installation of Flex</title>
    23 
    24     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="flex.xml"
    26     xpointer="xpointer(//*[@os='p1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="flex.xml"
    30     xpointer="xpointer(//*[@os='p2'])"/>
    3123
    3224    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    2222  <sect2 role="installation">
    2323    <title>Installation of Flex</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/flex.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/flex.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    4343    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4444    href="../common/gawk.xml"
     45    xpointer="xpointer(//*[@os='e2'])"/>
     46
     47    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     48    href="../common/gawk.xml"
    4549    xpointer="xpointer(//*[@os='f'])"/>
    4650

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

    rec008670 r229ed25  
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3333    href="../common/gcc.xml"
     34    xpointer="xpointer(//*[@os='fix1'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37    href="../common/gcc.xml"
     38    xpointer="xpointer(//*[@os='fix2'])"/>
     39
     40    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     41    href="../common/gcc.xml"
    3442    xpointer="xpointer(//*[@os='d'])"/>
    3543
    … …  
    5664    --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
    5765    --enable-__cxa_atexit --enable-c99 --enable-long-long \
    58     --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
     66    --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>
    5970
    6071    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6980    href="../common/gcc.xml"
    7081    xpointer="xpointer(//*[@os='l'])"/>
     82
     83    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     84    href="../common/gcc.xml"
     85    xpointer="xpointer(//*[@os='s1'])"/>
     86
     87    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     88    href="../common/gcc.xml"
     89    xpointer="xpointer(//*[@os='s2'])"/>
    7190
    7291    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    118137    xpointer="xpointer(//*[@os='x'])"/>
    119138
     139    <para os="y">Finally, move some misplaced files:</para>
     140
     141
     142<screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib
     143mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
     144
    120145  </sect2>
    121146

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

    rec008670 r229ed25  
    4343   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4444    href="../common/gettext.xml"
     45    xpointer="xpointer(//*[@os='e2'])"/>
     46
     47   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     48    href="../common/gettext.xml"
    4549    xpointer="xpointer(//*[@os='f'])"/>
    4650

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

    rec008670 r229ed25  
    4444   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4545    href="../common/gettext.xml"
     46    xpointer="xpointer(//*[@os='e2'])"/>
     47
     48   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     49    href="../common/gettext.xml"
    4650    xpointer="xpointer(//*[@os='f'])"/>
    4751

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

    rec008670 r229ed25  
    4242    xpointer="xpointer(//*[@os='e'])"/>
    4343
     44   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../common/gettext.xml"
     46    xpointer="xpointer(//*[@os='e2'])"/>
     47
    4448    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4549    href="../common/gettext.xml"

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

    rec008670 r229ed25  
    4040    xpointer="xpointer(//*[@os='a'])"/>
    4141
    42 <screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD64}" \
     42<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    4343CXX="g++ -isystem /usr/include ${BUILD64}" \
    4444LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
    4545  ./configure --prefix=/usr \
    46     --libdir=/usr/lib64 --enable-cxx --enable-mpbsd</userinput></screen>
     46    --libdir=/usr/lib64 --enable-cxx</userinput></screen>
    4747
    4848    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    4242    xpointer="xpointer(//*[@os='a'])"/>
    4343
    44 <screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILDN32}" \
     44<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
    4545CXX="g++ -isystem /usr/include ${BUILDN32}" \
    4646LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
    4747  ABI=n32 ./configure --prefix=/usr \
    48     --libdir=/usr/lib32 --enable-cxx --enable-mpbsd</userinput></screen>
     48    --libdir=/usr/lib32 --enable-cxx</userinput></screen>
    4949
    5050    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    4141    xpointer="xpointer(//*[@os='a'])"/>
    4242
    43 <screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD32}" \
     43<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
    4444CXX="g++ -isystem /usr/include ${BUILD32}" \
    4545LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
    46   ABI=32 ./configure --prefix=/usr \
    47     -enable-cxx --enable-mpbsd</userinput></screen>
     46  ABI=32 ./configure --prefix=/usr --enable-cxx</userinput></screen>
    4847
    4948    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    2727
    2828<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    29    --bindir=/bin --without-included-regex</userinput></screen>
     29   --bindir=/bin</userinput></screen>
    3030
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4040    href="../common/grep.xml"
    4141    xpointer="xpointer(//*[@os='e'])"/>
     42
     43    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     44    href="../common/grep.xml"
     45    xpointer="xpointer(//*[@os='e2'])"/>
    4246
    4347    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    4242    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4343    href="../common/gzip.xml"
     44    xpointer="xpointer(//*[@os='e2'])"/>
     45
     46    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     47    href="../common/gzip.xml"
    4448    xpointer="xpointer(//*[@os='f'])"/>
    4549

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

    rec008670 r229ed25  
    2929    href="../common/iproute2.xml"
    3030    xpointer="xpointer(//*[@os='s2'])"/>
     31   
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/iproute2.xml"
     34    xpointer="xpointer(//*[@os='f1'])"/>
     35   
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37    href="../common/iproute2.xml"
     38    xpointer="xpointer(//*[@os='f2'])"/>
    3139
    3240    <para os="p1">This patch adds the ability to update the LIBDIR path:</para>

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

    rec008670 r229ed25  
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3333    href="../common/iputils.xml"
    34     xpointer="xpointer(//*[@os='p3'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/iputils.xml"
    38     xpointer="xpointer(//*[@os='p4'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/iputils.xml"
    4234    xpointer="xpointer(//*[@os='a'])"/>
    4335
    44 <screen os="b"><userinput>make CC="gcc ${BUILD64}" IPV4_TARGETS="tracepath ping clockdiff" \
     36<screen os="b"><userinput>make USE_CAP=no CC="gcc ${BUILD64}" \
     37    IPV4_TARGETS="tracepath ping clockdiff rdisc" \
    4538    IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
    4639

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

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-cloog-ppl" role="wrap">
    9   <?dbhtml filename="cloog-ppl-64bit.html"?>
     8<sect1 id="ch-system-isl" role="wrap">
     9  <?dbhtml filename="isl-64bit.html"?>
    1010
    11   <title>CLooG-PPL-&cloog-ppl-version; 64 Bit</title>
     11  <title>ISL-&isl-version; 64 Bit</title>
    1212
    13   <indexterm zone="ch-system-cloog-ppl">
    14     <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
     13  <indexterm zone="ch-system-isl">
     14    <primary sortas="a-ISL">ISL</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="../common/cloog-ppl.xml"
     18  href="../common/isl.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of CLooG-PPL</title>
     22    <title>Installation of ISL</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/cloog-ppl.xml"
     25    href="../common/isl.xml"
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    2828<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    2929LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
    30   ./configure --prefix=/usr \
    31     --libdir=/usr/lib64 --enable-shared --with-gmp \
    32     --with-ppl</userinput></screen>
     30  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    3331
    3432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    35     href="../common/cloog-ppl.xml"
     33    href="../common/isl.xml"
    3634    xpointer="xpointer(//*[@os='c'])"/>
    3735
    3836    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    39     href="../common/cloog-ppl.xml"
     37    href="../common/isl.xml"
    4038    xpointer="xpointer(//*[@os='d'])"/>
    4139
    4240    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    43     href="../common/cloog-ppl.xml"
     41    href="../common/isl.xml"
    4442    xpointer="xpointer(//*[@os='e'])"/>
    4543
    4644    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    47     href="../common/cloog-ppl.xml"
     45    href="../common/isl.xml"
    4846    xpointer="xpointer(//*[@os='f'])"/>
    4947
    5048    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    51     href="../common/cloog-ppl.xml"
     49    href="../common/isl.xml"
    5250    xpointer="xpointer(//*[@os='g'])"/>
    5351
    5452    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    55     href="../common/cloog-ppl.xml"
     53    href="../common/isl.xml"
    5654    xpointer="xpointer(//*[@os='h'])"/>
    5755
    5856    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    59     href="../common/cloog-ppl.xml"
     57    href="../common/isl.xml"
    6058    xpointer="xpointer(//*[@os='i'])"/>
    6159
     60    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     61    href="../common/isl.xml"
     62    xpointer="xpointer(//*[@os='j'])"/>
     63
     64<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib64
     65mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
    6266  </sect2>
    6367
    6468  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    65   href="../common/cloog-ppl.xml"
    66   xpointer="xpointer(id('contents-cloog-ppl'))"/>
     69  href="../common/isl.xml"
     70  xpointer="xpointer(id('contents-isl'))"/>
    6771
    6872</sect1>

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

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-cloog-ppl-n32" role="wrap">
    9   <?dbhtml filename="cloog-ppl-n32.html"?>
     8<sect1 id="ch-system-isl-n32" role="wrap">
     9  <?dbhtml filename="isl-n32.html"?>
    1010
    11   <title>CLooG-PPL-&cloog-ppl-version; N32 Libraries</title>
     11  <title>ISL-&isl-version; N32 Libraries</title>
    1212
    13   <indexterm zone="ch-system-cloog-ppl-n32">
    14     <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
     13  <indexterm zone="ch-system-isl-n32">
     14    <primary sortas="a-ISL">ISL</primary>
    1515    <secondary>N32</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/cloog-ppl.xml"
     19  href="../common/isl.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of CLooG-PPL</title>
     23    <title>Installation of ISL</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/cloog-ppl.xml"
     26    href="../common/isl.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    2929<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
    3030LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
    31   ./configure --prefix=/usr \
    32     --libdir=/usr/lib32 --enable-shared --with-gmp \
    33     --with-ppl</userinput></screen>
     31  ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
    3432
    3533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/cloog-ppl.xml"
     34    href="../common/isl.xml"
    3735    xpointer="xpointer(//*[@os='c'])"/>
    3836
    3937    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/cloog-ppl.xml"
     38    href="../common/isl.xml"
    4139    xpointer="xpointer(//*[@os='d'])"/>
    4240
    4341    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/cloog-ppl.xml"
     42    href="../common/isl.xml"
    4543    xpointer="xpointer(//*[@os='e'])"/>
    4644
    4745    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/cloog-ppl.xml"
     46    href="../common/isl.xml"
    4947    xpointer="xpointer(//*[@os='f'])"/>
    5048
    5149    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../common/cloog-ppl.xml"
     50    href="../common/isl.xml"
    5351    xpointer="xpointer(//*[@os='g'])"/>
    5452
    5553    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    56     href="../common/cloog-ppl.xml"
     54    href="../common/isl.xml"
    5755    xpointer="xpointer(//*[@os='h'])"/>
    5856
    5957    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    60     href="../common/cloog-ppl.xml"
     58    href="../common/isl.xml"
    6159    xpointer="xpointer(//*[@os='i'])"/>
    6260
     61    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     62    href="../common/isl.xml"
     63    xpointer="xpointer(//*[@os='j'])"/>
     64
     65<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib32
     66mv -v /usr/lib32/*gdb.py /usr/share/gdb/auto-load/usr/lib32</userinput></screen>
    6367  </sect2>
    6468
    … …  
    6771
    6872    <para>Details on this package are located in <xref
    69     linkend="contents-cloog-ppl" role="."/></para>
     73    linkend="contents-isl" role="."/></para>
    7074
    7175  </sect2>

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

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-cloog-ppl-32" role="wrap">
    9   <?dbhtml filename="cloog-ppl.html"?>
     8<sect1 id="ch-system-isl-32" role="wrap">
     9  <?dbhtml filename="isl.html"?>
    1010
    11   <title>CLooG-PPL-&cloog-ppl-version; 32 Bit Libraries</title>
     11  <title>ISL-&isl-version; 32 Bit Libraries</title>
    1212
    13   <indexterm zone="ch-system-cloog-ppl-32">
    14     <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
     13  <indexterm zone="ch-system-isl-32">
     14    <primary sortas="a-ISL">ISL</primary>
    1515    <secondary>32 Bit</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/cloog-ppl.xml"
     19  href="../common/isl.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of CLooG-PPL</title>
     23    <title>Installation of ISL</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/cloog-ppl.xml"
     26    href="../common/isl.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    2929<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
    3030LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
    31   ./configure --prefix=/usr \
    32     --host=${CLFS_TARGET32} --enable-shared \
    33     --with-gmp --with-ppl</userinput></screen>
     31  ./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
    3432
    3533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/cloog-ppl.xml"
     34    href="../common/isl.xml"
    3735    xpointer="xpointer(//*[@os='c'])"/>
    3836
    3937    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/cloog-ppl.xml"
     38    href="../common/isl.xml"
    4139    xpointer="xpointer(//*[@os='d'])"/>
    4240
    4341    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/cloog-ppl.xml"
     42    href="../common/isl.xml"
    4543    xpointer="xpointer(//*[@os='e'])"/>
    4644
    4745    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/cloog-ppl.xml"
     46    href="../common/isl.xml"
    4947    xpointer="xpointer(//*[@os='f'])"/>
    5048
    5149    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../common/cloog-ppl.xml"
     50    href="../common/isl.xml"
    5351    xpointer="xpointer(//*[@os='g'])"/>
    5452
    5553    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    56     href="../common/cloog-ppl.xml"
     54    href="../common/isl.xml"
    5755    xpointer="xpointer(//*[@os='h'])"/>
    5856
    5957    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    60     href="../common/cloog-ppl.xml"
     58    href="../common/isl.xml"
    6159    xpointer="xpointer(//*[@os='i'])"/>
     60
     61   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     62    href="../common/isl.xml"
     63    xpointer="xpointer(//*[@os='j'])"/>
     64
     65    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     66    href="../common/isl.xml"
     67    xpointer="xpointer(//*[@os='k'])"/>
    6268
    6369  </sect2>
    … …  
    6773
    6874    <para>Details on this package are located in <xref
    69     linkend="contents-cloog-ppl" role="."/></para>
     75    linkend="contents-isl" role="."/></para>
    7076
    7177  </sect2>

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

    rec008670 r229ed25  
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/kbd.xml"
    26     xpointer="xpointer(//*[@os='p1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/kbd.xml"
    30     xpointer="xpointer(//*[@os='p2'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/kbd.xml"
    3426    xpointer="xpointer(//*[@os='a'])"/>
    3527
    36 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="/tools/lib64/pkgconfig" \
     29    ./configure --prefix=/usr --disable-vlock --enable-optional-progs</userinput></screen>
    3730
    3831    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4033    xpointer="xpointer(//*[@os='c'])"/>
    4134
    42 <screen os="d"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
     35<screen os="d"><userinput>make</userinput></screen>
    4336
    4437    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-module-init-tools" role="wrap">
    9   <?dbhtml filename="module-init-tools.html"?>
     8<sect1 id="ch-system-kmod" role="wrap">
     9  <?dbhtml filename="kmod-64bit.html"?>
    1010
    11   <title>Module-Init-Tools-&module-init-tools-version;</title>
     11  <title>Kmod-&kmod-version; 64 Bit</title>
    1212
    13   <indexterm zone="ch-system-module-init-tools">
    14     <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
     13  <indexterm zone="ch-system-kmod">
     14    <primary sortas="a-Kmod">Kmod</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="../common/module-init-tools.xml"
     18  href="../common/kmod.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of Module-Init-Tools</title>
     22    <title>Installation of Kmod</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/module-init-tools.xml"
     25    href="../common/kmod.xml"
     26    xpointer="xpointer(//*[@os='a'])"/>
     27
     28<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>
     33
     34    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     35    href="../common/kmod.xml"
    2636    xpointer="xpointer(//*[@os='c'])"/>
    2737
    2838    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/module-init-tools.xml"
     39    href="../common/kmod.xml"
    3040    xpointer="xpointer(//*[@os='d'])"/>
    3141
    3242    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/module-init-tools.xml"
     43    href="../common/kmod.xml"
    3444    xpointer="xpointer(//*[@os='e'])"/>
    3545
    36 <screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    37     --bindir=/bin --sbindir=/sbin \
    38     --enable-zlib-dynamic</userinput></screen>
     46    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     47    href="../common/kmod.xml"
     48    xpointer="xpointer(//*[@os='f'])"/>
    3949
    4050    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/module-init-tools.xml"
     51    href="../common/kmod.xml"
     52    xpointer="xpointer(//*[@os='f2'])"/>
     53
     54    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     55    href="../common/kmod.xml"
    4256    xpointer="xpointer(//*[@os='g'])"/>
    4357
    4458    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/module-init-tools.xml"
     59    href="../common/kmod.xml"
    4660    xpointer="xpointer(//*[@os='h'])"/>
    47 
     61   
    4862    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/module-init-tools.xml"
     63    href="../common/kmod.xml"
    5064    xpointer="xpointer(//*[@os='i'])"/>
    51 
     65   
    5266    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="../common/module-init-tools.xml"
     67    href="../common/kmod.xml"
    5468    xpointer="xpointer(//*[@os='j'])"/>
    55 
    56     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    57     href="../common/module-init-tools.xml"
    58     xpointer="xpointer(//*[@os='k'])"/>
    5969
    6070  </sect2>
    6171
    6272  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    63   href="../common/module-init-tools.xml"
    64   xpointer="xpointer(id('contents-module-init-tools'))"/>
     73  href="../common/kmod.xml"
     74  xpointer="xpointer(id('contents-kmod'))"/>
    6575
    6676</sect1>

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

    rec008670 r229ed25  
    3636    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3737    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"
    3842    xpointer="xpointer(//*[@os='d'])"/>
    3943

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

    rec008670 r229ed25  
    3737    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3838    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"
    3943    xpointer="xpointer(//*[@os='d'])"/>
    4044

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

    rec008670 r229ed25  
    3636    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3737    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"
    3842    xpointer="xpointer(//*[@os='d'])"/>
    3943

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

    rec008670 r229ed25  
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5050    href="../common/libtool.xml"
     51    xpointer="xpointer(//*[@os='e2'])"/>
     52
     53    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     54    href="../common/libtool.xml"
    5155    xpointer="xpointer(//*[@os='f'])"/>
    5256
    … …  
    6064
    6165<screen os="m2"><userinput>mv -v /usr/bin/libtool{,-64}
    62 ln -s multiarch_wrapper /usr/bin/libtool</userinput></screen>
     66ln -sv multiarch_wrapper /usr/bin/libtool</userinput></screen>
    6367
    6468  </sect2>

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

    rec008670 r229ed25  
    4242   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4343    href="../common/m4.xml"
     44    xpointer="xpointer(//*[@os='e2'])"/>
     45
     46   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     47    href="../common/m4.xml"
    4448    xpointer="xpointer(//*[@os='f'])"/>
    4549

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

    rec008670 r229ed25  
    4242    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4343    href="../common/make.xml"
     44    xpointer="xpointer(//*[@os='e2'])"/>
     45
     46    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     47    href="../common/make.xml"
    4448    xpointer="xpointer(//*[@os='f'])"/>
    4549

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

    rec008670 r229ed25  
    2828<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    2929LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
    30   EGREP="grep -E" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
     30  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    2929<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
    3030LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
    31   EGREP="grep -E" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
     31  ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    2929<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
    3030LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
    31   EGREP="grep -E" ./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
     31  ./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    2121  <sect2 role="installation">
    2222    <title>Installation of MPFR</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/mpfr.xml"
     26    xpointer="xpointer(//*[@os='p1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/mpfr.xml"
     30    xpointer="xpointer(//*[@os='p2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    2222  <sect2 role="installation">
    2323    <title>Installation of MPFR</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../common/mpfr.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../common/mpfr.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    2222  <sect2 role="installation">
    2323    <title>Installation of MPFR</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../common/mpfr.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../common/mpfr.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    9191<screen os="g"><userinput>echo 'echo "32bit Version"' &gt; test-32
    9292echo 'echo "64bit Version"' &gt; test-64
    93 chmod 755 test-32 test-64
     93chmod -v 755 test-32 test-64
    9494ln -sv /usr/bin/multiarch_wrapper test</userinput></screen>
    9595
    … …  
    103103<screen os="k" role="nodump"><userinput>32bit Version
    10410464bit Version</userinput></screen>
     105
     106    <para os="l">Remove the testcase source, binaries, and link:</para>
     107
     108<screen os="m"><userinput>rm -v multiarch_wrapper.c test{,-32,-64}</userinput></screen>
    105109
    106110  </sect2>

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

    rec008670 r229ed25  
    3737   ./configure --prefix=/usr --libdir=/lib64 \
    3838   --with-shared --without-debug --enable-widec \
    39    --with-manpage-format=normal</userinput></screen>
     39   --with-manpage-format=normal \
     40   --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
    4041
    4142    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    3838   ./configure --prefix=/usr --libdir=/lib32 \
    3939   --with-shared --without-debug --enable-widec \
    40    --with-manpage-format=normal</userinput></screen>
     40   --with-manpage-format=normal \
     41   --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
    4142
    4243    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    3838   ./configure --prefix=/usr --libdir=/lib \
    3939   --with-shared --without-debug --enable-widec \
    40    --with-manpage-format=normal</userinput></screen>
     40   --with-manpage-format=normal \
     41   --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
    4142
    4243    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    4242    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4343    href="../common/patch.xml"
     44    xpointer="xpointer(//*[@os='e2'])"/>
     45
     46    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     47    href="../common/patch.xml"
    4448    xpointer="xpointer(//*[@os='f'])"/>
    4549

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

    rec008670 r229ed25  
    102102    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    103103    href="../common/perl.xml"
     104    xpointer="xpointer(//*[@os='h2'])"/>
     105
     106    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     107    href="../common/perl.xml"
    104108    xpointer="xpointer(//*[@os='j'])"/>
    105109

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

    rec008670 r229ed25  
    105105    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    106106    href="../common/perl.xml"
     107    xpointer="xpointer(//*[@os='h2'])"/>
     108
     109    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     110    href="../common/perl.xml"
    107111    xpointer="xpointer(//*[@os='j'])"/>
    108112

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

    rec008670 r229ed25  
    4545    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4646    href="../common/perl.xml"
     47    xpointer="xpointer(//*[@os='a03'])"/>
     48
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     50    href="../common/perl.xml"
    4751    xpointer="xpointer(//*[@os='a'])"/>
    4852
    … …  
    7377    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7478    href="../common/perl.xml"
     79    xpointer="xpointer(//*[@os='h2'])"/>
     80
     81    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     82    href="../common/perl.xml"
    7583    xpointer="xpointer(//*[@os='j'])"/>
    7684

  • BOOK/final-system/multilib/pkg-config-lite.xml

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-pkg-config" role="wrap">
    9   <?dbhtml filename="pkg-config.html"?>
     8<sect1 id="ch-system-pkg-config-lite" role="wrap">
     9  <?dbhtml filename="pkg-config-lite.html"?>
    1010
    11   <title>Pkg-config-&pkg-config-version;</title>
     11  <title>Pkg-config-lite-&pkg-config-lite-version;</title>
    1212
    13   <indexterm zone="ch-system-pkg-config">
    14     <primary sortas="a-Pkg-config">Pkg-config</primary>
     13  <indexterm zone="ch-system-pkg-config-lite">
     14    <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="../common/pkg-config.xml"
     18  href="../common/pkg-config-lite.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of Pkg-config</title>
     22    <title>Installation of Pkg-config-lite</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/pkg-config.xml"
     25    href="../common/pkg-config-lite.xml"
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include" \
    29   GLIB_LIBS="-lglib-2.0" \
    30   CC="gcc ${BUILD64}" \
    31   ./configure --prefix=/usr \
    32     --with-pc-path=/usr/share/pkgconfig </userinput></screen>
    33 
    34     <variablelist os="bb">
    35       <title>The meaning of the new configure option:</title>
    36 
    37       <varlistentry>
    38         <term><parameter>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/libi64/glib-2.0/include"</parameter></term>
    39         <term><parameter>GLIB_LIBS="-lglib-2.0"</parameter></term>
    40         <listitem>
    41           <para>Pkg-config no longer comes with Glib and because Pkg-config
    42         has not been installed itself it needs to be told where Glib is.</para>
    43         </listitem>
    44       </varlistentry>
    45     </variablelist>
    46 
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
     29    --with-pc-path=/usr/share/pkgconfig</userinput></screen>
    4730
    4831    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/pkg-config.xml"
     32    href="../common/pkg-config-lite.xml"
    5033    xpointer="xpointer(//*[@os='c'])"/>
    5134
    5235    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="../common/pkg-config.xml"
     36    href="../common/pkg-config-lite.xml"
    5437    xpointer="xpointer(//*[@os='d'])"/>
    5538
    5639    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    57     href="../common/pkg-config.xml"
     40    href="../common/pkg-config-lite.xml"
    5841    xpointer="xpointer(//*[@os='e'])"/>
    5942
    6043    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    61     href="../common/pkg-config.xml"
     44    href="../common/pkg-config-lite.xml"
     45    xpointer="xpointer(//*[@os='e2'])"/>
     46
     47    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     48    href="../common/pkg-config-lite.xml"
    6249    xpointer="xpointer(//*[@os='f'])"/>
    6350
    6451    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    65     href="../common/pkg-config.xml"
     52    href="../common/pkg-config-lite.xml"
    6653    xpointer="xpointer(//*[@os='g'])"/>
    6754
    … …  
    7663    future.</para>
    7764
    78 <screen os="m4"><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
     65<screen os="m4"><userinput>cat &gt;&gt; /root/.bash_profile &lt;&lt; EOF
    7966export PKG_CONFIG_PATH32="${PKG_CONFIG_PATH32}"
    8067export PKG_CONFIG_PATH64="${PKG_CONFIG_PATH64}"
    … …  
    8471
    8572  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    86   href="../common/pkg-config.xml"
    87   xpointer="xpointer(id('contents-pkg-config'))"/>
     73  href="../common/pkg-config-lite.xml"
     74  xpointer="xpointer(id('contents-pkg-config-lite'))"/>
    8875
    8976</sect1>

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

    rec008670 r229ed25  
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3333    href="../common/procps.xml"
     34    xpointer="xpointer(//*[@os='p3'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37    href="../common/procps.xml"
     38    xpointer="xpointer(//*[@os='p4'])"/>
     39
     40    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     41    href="../common/procps.xml"
    3442    xpointer="xpointer(//*[@os='s1'])"/>
    3543
    … …  
    5260    xpointer="xpointer(//*[@os='d'])"/>
    5361
    54 <screen os="e"><userinput>make install lib64=lib64</userinput></screen>
     62<screen os="e"><userinput>make SKIP='/bin/kill /usr/share/man/man1/kill.1' install lib64=lib64</userinput></screen>
    5563
    5664    <variablelist os="f">

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

    rec008670 r229ed25  
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3434    href="../common/procps.xml"
     35    xpointer="xpointer(//*[@os='p3'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/procps.xml"
     39    xpointer="xpointer(//*[@os='p4'])"/>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     42    href="../common/procps.xml"
    3543    xpointer="xpointer(//*[@os='s1'])"/>
    3644
    … …  
    5462
    5563
    56 <screen os="e"><userinput>make install lib64=lib32</userinput></screen>
     64<screen os="e"><userinput>make SKIP='/bin/kill /usr/share/man/man1/kill.1' install lib64=lib32</userinput></screen>
    5765
    5866    <variablelist os="f">

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

    rec008670 r229ed25  
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3434    href="../common/procps.xml"
     35    xpointer="xpointer(//*[@os='p3'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/procps.xml"
     39    xpointer="xpointer(//*[@os='p4'])"/>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     42    href="../common/procps.xml"
    3543    xpointer="xpointer(//*[@os='s1'])"/>
    3644
    … …  
    5361    xpointer="xpointer(//*[@os='d'])"/>
    5462
    55 <screen os="e"><userinput>make install lib64=lib</userinput></screen>
     63<screen os="e"><userinput>make SKIP='/bin/kill /usr/share/man/man1/kill.1' install lib64=lib</userinput></screen>
    5664
    5765    <variablelist os="f">

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

    rec008670 r229ed25  
    4343    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4444    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"
    4549    xpointer="xpointer(//*[@os='f'])"/>
    4650

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

    rec008670 r229ed25  
    5151    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5252    href="../common/sed.xml"
     53    xpointer="xpointer(//*[@os='g2'])"/>
     54
     55    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     56    href="../common/sed.xml"
    5357    xpointer="xpointer(//*[@os='h'])"/>
    5458

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

    rec008670 r229ed25  
    3030    xpointer="xpointer(//*[@os='b'])"/>
    3131
    32 <screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --sysconfdir=/etc \
    33    --without-libpam --without-audit --without-selinux</userinput></screen>
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/shadow.xml"
     34    xpointer="xpointer(//*[@os='c'])"/>
    3435
    3536    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    3738    xpointer="xpointer(//*[@os='d'])"/>
    3839
    39     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/shadow.xml"
    41     xpointer="xpointer(//*[@os='e'])"/>
     40<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --sysconfdir=/etc</userinput></screen>
    4241
    4342    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    2020  <sect2 role="installation">
    2121    <title>Installation of Sysvinit</title>
     22 
     23    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     24    href="../common/sysvinit.xml"
     25    xpointer="xpointer(//*[@os='a'])"/>
     26
     27    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     28    href="../common/sysvinit.xml"
     29    xpointer="xpointer(//*[@os='b'])"/>
    2230
    2331    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    5252    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5353    href="../common/tar.xml"
     54    xpointer="xpointer(//*[@os='e2'])"/>
     55
     56    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     57    href="../common/tar.xml"
    5458    xpointer="xpointer(//*[@os='f'])"/>
    5559
    … …  
    5761    href="../common/tar.xml"
    5862    xpointer="xpointer(//*[@os='g'])"/>
     63
     64    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     65    href="../common/tar.xml"
     66    xpointer="xpointer(//*[@os='h'])"/>
     67
     68    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     69    href="../common/tar.xml"
     70    xpointer="xpointer(//*[@os='i'])"/>
    5971
    6072  </sect2>

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

    rec008670 r229ed25  
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/texinfo.xml"
    26     xpointer="xpointer(//*[@os='p1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/texinfo.xml"
    30     xpointer="xpointer(//*[@os='p2'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/texinfo.xml"
    3426    xpointer="xpointer(//*[@os='a'])"/>
    3527
    … …  
    4739    href="../common/texinfo.xml"
    4840    xpointer="xpointer(//*[@os='e'])"/>
     41
     42    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     43    href="../common/texinfo.xml"
     44    xpointer="xpointer(//*[@os='e2'])"/>
    4945
    5046    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    3131
    3232<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
    33     --enable-partx --disable-wall --enable-write</userinput></screen>
     33    --enable-write</userinput></screen>
    3434
    3535    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    5151    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5252    href="../common/util-linux.xml"
     53    xpointer="xpointer(//*[@os='f2'])"/>
     54
     55    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     56    href="../common/util-linux.xml"
    5357    xpointer="xpointer(//*[@os='g'])"/>
    5458

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

    rec008670 r229ed25  
    2828
    2929<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
    30     --enable-partx --disable-wall --enable-write</userinput></screen>
     30    --enable-write</userinput></screen>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4545    href="../common/util-linux.xml"
    4646    xpointer="xpointer(//*[@os='f'])"/>
     47
     48    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     49    href="../common/util-linux.xml"
     50    xpointer="xpointer(//*[@os='f2'])"/>
    4751
    4852    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    99  <?dbhtml filename="util-linux.html"?>
    1010
    11   <title>Util-linux-&util-linux-version;</title>
     11  <title>Util-linux-&util-linux-version; 32 Bit</title>
    1212
    1313  <indexterm zone="ch-system-util-linux-32">
    … …  
    2828
    2929<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
    30     --enable-partx --disable-wall --enable-write</userinput></screen>
     30    --enable-write</userinput></screen>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4444    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4545    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'])"/>
     51
     52    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     53    href="../common/util-linux.xml"
    4654    xpointer="xpointer(//*[@os='f'])"/>
     55
     56    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     57    href="../common/util-linux.xml"
     58    xpointer="xpointer(//*[@os='f2'])"/>
    4759
    4860    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    6868    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6969    href="../common/vim.xml"
     70    xpointer="xpointer(//*[@os='i2'])"/>
     71
     72    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     73    href="../common/vim.xml"
     74    xpointer="xpointer(//*[@os='i3'])"/>
     75
     76    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     77    href="../common/vim.xml"
    7078    xpointer="xpointer(//*[@os='j'])"/>
    7179

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

    rec008670 r229ed25  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    2929
    3030    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4242    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4343    href="xz.xml"
     44    xpointer="xpointer(//*[@os='e2'])"/>
     45
     46    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     47    href="xz.xml"
    4448    xpointer="xpointer(//*[@os='f'])"/>
    4549
    … …  
    4953
    5054    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    51     href="xz.xml"
     55    href="../common/xz.xml"
    5256    xpointer="xpointer(//*[@os='h'])"/>
    5357
    5458    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    55     href="xz.xml"
     59    href="../common/xz.xml"
    5660    xpointer="xpointer(//*[@os='i'])"/>
    5761
    … …  
    6064    xpointer="xpointer(//*[@os='j'])"/>
    6165
    62     <screen os="k"><userinput>mv -v /lib64/liblzma.a /usr/lib64</userinput></screen>
     66<screen os="k"><userinput>mv -v /usr/lib64/liblzma.so.* /lib64
     67ln -svf ../../lib64/liblzma.so.&xz-version; /usr/lib64/liblzma.so</userinput></screen>
    6368
    6469  </sect2>

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

    rec008670 r229ed25  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
    3030
    3131    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4343    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4444    href="xz.xml"
    45     xpointer="xpointer(//*[@os='f'])"/>
     45    xpointer="xpointer(//*[@os='e2'])"/>
    4646
    4747    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4848    href="xz.xml"
    49     xpointer="xpointer(//*[@os='g'])"/>
     49    xpointer="xpointer(//*[@os='f'])"/>
    5050
    51     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="xz.xml"
    53     xpointer="xpointer(//*[@os='h'])"/>
    54 
    55     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    56     href="xz.xml"
    57     xpointer="xpointer(//*[@os='i'])"/>
     51<screen os="g"><userinput>make install</userinput></screen>
    5852
    5953    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    6155    xpointer="xpointer(//*[@os='j'])"/>
    6256
    63 <screen os="k"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
     57<screen os="k"><userinput>mv -v /usr/lib32/liblzma.so.* /lib32
     58ln -svf ../../lib32/liblzma.so.&xz-version; /usr/lib32/liblzma.so</userinput></screen>
    6459
    6560  </sect2>

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

    rec008670 r229ed25  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr libdir=/lib</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/2001/XInclude"
    … …  
    4343    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4444    href="../common/xz.xml"
     45    xpointer="xpointer(//*[@os='e2'])"/>
     46
     47    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     48    href="../common/xz.xml"
    4549    xpointer="xpointer(//*[@os='f'])"/>
    4650
    … …  
    5155    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5256    href="../common/xz.xml"
    53     xpointer="xpointer(//*[@os='h'])"/>
     57    xpointer="xpointer(//*[@os='j'])"/>
    5458
    5559    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5660    href="../common/xz.xml"
    57     xpointer="xpointer(//*[@os='i'])"/>
    58 
    59     <para os="j">Move the static libraries to the proper location:</para>
    60 
    61     <screen os="k"><userinput>mv -v /lib/liblzma.a /usr/lib</userinput></screen>
     61    xpointer="xpointer(//*[@os='k'])"/>
    6262
    6363  </sect2>

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

    rec008670 r229ed25  
    4545    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4646    href="zlib.xml"
     47    xpointer="xpointer(//*[@os='e2'])"/>
     48
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     50    href="zlib.xml"
    4751    xpointer="xpointer(//*[@os='f'])"/>
    4852

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

    rec008670 r229ed25  
    4646    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4747    href="zlib.xml"
     48    xpointer="xpointer(//*[@os='e2'])"/>
     49
     50    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     51    href="zlib.xml"
    4852    xpointer="xpointer(//*[@os='f'])"/>
    4953

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

    rec008670 r229ed25  
    4646    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4747    href="../common/zlib.xml"
     48    xpointer="xpointer(//*[@os='e2'])"/>
     49
     50    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     51    href="../common/zlib.xml"
    4852    xpointer="xpointer(//*[@os='f'])"/>
    4953
Note: See TracChangeset for help on using the changeset viewer.