Changeset 026bb5d for BOOK/final-system/multilib

Timestamp:

Dec 18, 2013, 1:04:00 AM (12 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (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:

Updated simp branch to match main book

Location:

BOOK/final-system/multilib

Files:

• autoconf.xml (modified) (1 diff)
• automake.xml (modified) (1 diff)
• bc.xml (moved) (moved from BOOK/final-system/multilib/glib-64bit.xml ) (2 diffs)
• binutils.xml (modified) (2 diffs)
• bison-64bit.xml (modified) (2 diffs)
• bison-n32.xml (modified) (2 diffs)
• bison.xml (modified) (2 diffs)
• cloog-64bit.xml (moved) (moved from BOOK/final-system/multilib/cloog-ppl-64bit.xml ) (3 diffs)
• cloog-n32.xml (moved) (moved from BOOK/final-system/multilib/cloog-ppl-n32.xml ) (3 diffs)
• cloog.xml (moved) (moved from BOOK/final-system/multilib/cloog-ppl.xml ) (3 diffs)
• coreutils.xml (modified) (2 diffs)
• diffutils.xml (modified) (1 diff)
• e2fsprogs-64bit.xml (modified) (1 diff)
• eglibc-64bit.xml (modified) (3 diffs)
• eglibc.xml (modified) (4 diffs)
• eudev-64bit.xml (added)
• eudev-n32.xml (added)
• eudev.xml (added)
• file-64bit.xml (modified) (1 diff)
• file-n32.xml (modified) (1 diff)
• file.xml (modified) (1 diff)
• findutils.xml (modified) (1 diff)
• flex-64bit.xml (modified) (2 diffs)
• flex-n32.xml (modified) (1 diff)
• flex.xml (modified) (1 diff)
• gawk.xml (modified) (1 diff)
• gcc.xml (modified) (4 diffs)
• gettext-64bit.xml (modified) (1 diff)
• gettext-n32.xml (modified) (1 diff)
• gettext.xml (modified) (1 diff)
• gmp-64bit.xml (modified) (1 diff)
• gmp-n32.xml (modified) (1 diff)
• gmp.xml (modified) (1 diff)
• grep.xml (modified) (2 diffs)
• gzip.xml (modified) (1 diff)
• iproute2.xml (modified) (1 diff)
• iputils.xml (modified) (1 diff)
• isl-64bit.xml (moved) (moved from BOOK/final-system/multilib/module-init-tools.xml ) (1 diff)
• isl-n32.xml (moved) (moved from BOOK/final-system/multilib/ppl-n32.xml ) (2 diffs)
• isl.xml (added)
• kbd.xml (modified) (2 diffs)
• kmod-64bit.xml (added)
• kmod-n32.xml (added)
• kmod.xml (added)
• libee-64bit.xml (modified) (1 diff)
• libee-n32.xml (modified) (1 diff)
• libee.xml (modified) (1 diff)
• libtool-64bit.xml (modified) (2 diffs)
• make.xml (modified) (1 diff)
• mpc-64bit.xml (modified) (1 diff)
• mpc-n32.xml (modified) (1 diff)
• mpc.xml (modified) (1 diff)
• mpfr-64bit.xml (modified) (1 diff)
• mpfr-n32.xml (modified) (1 diff)
• mpfr.xml (modified) (1 diff)
• multiarch_wrapper.xml (modified) (2 diffs)
• ncurses-64bit.xml (modified) (1 diff)
• ncurses-n32.xml (modified) (1 diff)
• ncurses.xml (modified) (1 diff)
• patch.xml (modified) (1 diff)
• perl-64bit.xml (modified) (1 diff)
• perl-n32.xml (modified) (1 diff)
• perl.xml (modified) (2 diffs)
• pkg-config-lite.xml (moved) (moved from BOOK/final-system/multilib/pkg-config.xml ) (3 diffs)
• ppl-64bit.xml (deleted)
• ppl.xml (deleted)
• procps-64bit.xml (modified) (2 diffs)
• procps-n32.xml (modified) (2 diffs)
• procps.xml (modified) (2 diffs)
• rsyslog.xml (modified) (1 diff)
• sed.xml (modified) (1 diff)
• shadow.xml (modified) (2 diffs)
• sysvinit.xml (modified) (1 diff)
• tar.xml (modified) (2 diffs)
• texinfo.xml (modified) (2 diffs)
• udev-64bit.xml (deleted)
• util-linux-64bit.xml (modified) (2 diffs)
• util-linux-n32.xml (modified) (2 diffs)
• util-linux.xml (modified) (4 diffs)
• vim.xml (modified) (1 diff)
• xz-64bit.xml (modified) (4 diffs)
• xz-n32.xml (modified) (3 diffs)
• xz.xml (modified) (3 diffs)
• zlib-64bit.xml (modified) (1 diff)
• zlib-n32.xml (modified) (1 diff)
• zlib.xml (modified) (1 diff)

BOOK/final-system/multilib/autoconf.xml

@@ -42 +42 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='e3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/autoconf.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 

BOOK/final-system/multilib/automake.xml

@@ -41 +41 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/automake.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/autoconf.xml"
     xpointer="xpointer(//*[@os='f'])"/>

BOOK/final-system/multilib/bc.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-glib" role="wrap">
-  <?dbhtml filename="glib-64bit.html"?>
+<sect1 id="ch-system-bc" role="wrap">
+  <?dbhtml filename="bc.html"?>
 
-  <title>Glib-&glib-version; 64Bit</title>
+  <title>Bc-&bc-version;</title>
 
-  <indexterm zone="ch-system-glib">
-    <primary sortas="a-Glib">Glib</primary>
+  <indexterm zone="ch-system-bc">
+    <primary sortas="a-Bc">Bc</primary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glib.xml"
+  href="../common/bc.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of Glib</title>
+    <title>Installation of Bc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glib.xml"
+    href="../common/bc.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glib.xml"
+    href="../common/bc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glib.xml"
+    href="../common/bc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glib.xml"
+    href="../common/bc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glib.xml"
+    href="../common/bc.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bc.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glib.xml"
+    href="../common/bc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
@@ -51 +55 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/glib.xml"
-  xpointer="xpointer(id('contents-glib'))"/>
+  href="../common/bc.xml"
+  xpointer="xpointer(id('contents-bc'))"/>
 
 </sect1>

BOOK/final-system/multilib/binutils.xml

@@ -42 +42 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
+<!-- Branch update patch area
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+-->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
@@ -56 +65 @@
 <screen os="ca"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib ${BUILD64}" \
-  ../binutils-&binutils-version;/configure --prefix=/usr \
+  ../binutils-&binutils-dir;/configure --prefix=/usr \
     --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64</userinput></screen>
 

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

@@ -24 +24 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='t3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='t4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bison.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64  --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -39 +47 @@
     href="../common/bison.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='t3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='t4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bison.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32  --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -40 +48 @@
     href="../common/bison.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/bison.xml

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='t3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='t4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bison.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr  --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -40 +48 @@
     href="../common/bison.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/bison.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-cloog-ppl" role="wrap">
-  <?dbhtml filename="cloog-ppl-64bit.html"?>
+<sect1 id="ch-system-cloog" role="wrap">
+  <?dbhtml filename="cloog-64bit.html"?>
 
-  <title>CLooG-PPL-&cloog-ppl-version; 64 Bit</title>
+  <title>CLooG-&cloog-version; 64 Bit</title>
 
-  <indexterm zone="ch-system-cloog-ppl">
-    <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
+  <indexterm zone="ch-system-cloog">
+    <primary sortas="a-CLooG">CLooG</primary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/cloog-ppl.xml"
+  href="../common/cloog.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of CLooG-PPL</title>
+    <title>Installation of CLooG</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -29 +29 @@
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
   ./configure --prefix=/usr \
-    --libdir=/usr/lib64 --enable-shared --with-gmp \
-    --with-ppl</userinput></screen>
+    --libdir=/usr/lib64 --enable-shared --with-isl=system</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
@@ -63 +62 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/cloog-ppl.xml"
-  xpointer="xpointer(id('contents-cloog-ppl'))"/>
+  href="../common/cloog.xml"
+  xpointer="xpointer(id('contents-cloog'))"/>
 
 </sect1>

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

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-cloog-ppl-n32" role="wrap">
-  <?dbhtml filename="cloog-ppl-n32.html"?>
+<sect1 id="ch-system-cloog-n32" role="wrap">
+  <?dbhtml filename="cloog-n32.html"?>
 
-  <title>CLooG-PPL-&cloog-ppl-version; N32 Libraries</title>
+  <title>CLooG-&cloog-version; N32 Libraries</title>
 
-  <indexterm zone="ch-system-cloog-ppl-n32">
-    <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
+  <indexterm zone="ch-system-cloog-n32">
+    <primary sortas="a-CLooG">CLooG</primary>
     <secondary>N32</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/cloog-ppl.xml"
+  href="../common/cloog.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of CLooG-PPL</title>
+    <title>Installation of CLooG</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -30 +30 @@
 LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
   ./configure --prefix=/usr \
-    --libdir=/usr/lib32 --enable-shared --with-gmp \
-    --with-ppl</userinput></screen>
+    --libdir=/usr/lib32 --enable-shared --with-isl=system</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
@@ -67 +66 @@
 
     <para>Details on this package are located in <xref
-    linkend="contents-cloog-ppl" role="."/></para>
+    linkend="contents-cloog" role="."/></para>
 
   </sect2>

BOOK/final-system/multilib/cloog.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-cloog-ppl-32" role="wrap">
-  <?dbhtml filename="cloog-ppl.html"?>
+<sect1 id="ch-system-cloog-32" role="wrap">
+  <?dbhtml filename="cloog.html"?>
 
-  <title>CLooG-PPL-&cloog-ppl-version; 32 Bit Libraries</title>
+  <title>CLooG-&cloog-version; 32 Bit Libraries</title>
 
-  <indexterm zone="ch-system-cloog-ppl-32">
-    <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
+  <indexterm zone="ch-system-cloog-32">
+    <primary sortas="a-CLooG">CLooG</primary>
     <secondary>32 Bit</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/cloog-ppl.xml"
+  href="../common/cloog.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of CLooG-PPL</title>
+    <title>Installation of CLooG</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -30 +30 @@
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
   ./configure --prefix=/usr \
-    --host=${CLFS_TARGET32} --enable-shared \
-    --with-gmp --with-ppl</userinput></screen>
+    --host=${CLFS_TARGET32} --enable-shared --with-isl=system</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
@@ -67 +66 @@
 
     <para>Details on this package are located in <xref
-    linkend="contents-cloog-ppl" role="."/></para>
+    linkend="contents-cloog" role="."/></para>
 
   </sect2>

BOOK/final-system/multilib/coreutils.xml

@@ -34 +34 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="d"><userinput>FORCE_UNSAFE_CONFIGURE=1 CC="gcc ${BUILD64}" \
+   ./configure --prefix=/usr \
     --enable-no-install-program=kill,uptime \
     --enable-install-program=hostname</userinput></screen>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -106 +111 @@
     xpointer="xpointer(//*[@os='u'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
   </sect2>
 

BOOK/final-system/multilib/diffutils.xml

@@ -50 +50 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/diffutils.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 

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

@@ -63 +63 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='h2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 

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

@@ -40 +40 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    href="eglibc.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -70 +70 @@
 <screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64</userinput></screen>
+    --disable-profile --enable-kernel=2.6.32 \
+    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
+    --enable-obsolete-rpc</userinput></screen>
 
     <variablelist os="i">
@@ -79 +80 @@
         <term><parameter>--libexecdir=/usr/lib64/glibc</parameter></term>
         <listitem>
-          <para>This changes the location of the <command>pt_chown</command>
-          program from its default of <filename
+          <para>This changes the location of the <command>getconf</command>
+          utility from its default of <filename
           class="directory">/usr/libexec</filename> to <filename
           class="directory">/usr/lib64/glibc</filename>.</para>

BOOK/final-system/multilib/eglibc.xml

@@ -45 +45 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -69 +69 @@
 <screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32}</userinput></screen>
+    --disable-profile --enable-kernel=2.6.32 \
+    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32} \
+    --enable-obsolete-rpc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -88 +89 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
-    <para os="l1">In multilib, we tend to think that compiling for
+    <para os="l1b">In multilib, we tend to think that compiling for
     <literal>${CLFS_TARGET32}</literal> is <emphasis>not</emphasis>
     cross-compiling. EGLIBC takes the traditional view that if you are building
@@ -96 +97 @@
     sed allows these tests to succeed:</para>
 
-<screen os="l2"><userinput>sed -i '/cross-compiling/s@ifeq@ifneq@g' ../eglibc-&eglibc-version;/localedata/Makefile</userinput></screen>
+<screen os="l2b"><userinput>sed -i '/cross-compiling/s@ifeq@ifneq@g' ../eglibc-&eglibc-version;/localedata/Makefile</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -43 +43 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="file.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="file.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 

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

@@ -42 +42 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="file.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="file.xml"

BOOK/final-system/multilib/file.xml

@@ -43 +43 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/file.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/file.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 

BOOK/final-system/multilib/findutils.xml

@@ -54 +54 @@
     href="../common/findutils.xml"
     xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/findutils.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -24 +24 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="flex.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -48 +40 @@
     href="../common/flex.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -21 +21 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/flex.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/gawk.xml

@@ -43 +43 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gawk.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 

BOOK/final-system/multilib/gcc.xml

@@ -32 +32 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='fix1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='fix2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
@@ -56 +64 @@
     --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
     --enable-__cxa_atexit --enable-c99 --enable-long-long \
-    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
+    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
+    --enable-cloog-backend=isl --disable-isl-version-check --with-system-zlib \
+    --enable-checking=release --enable-libstdcxx-time \
+    --disable-install-libiberty</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -69 +80 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -118 +137 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
+    <para os="y">Finally, move some misplaced files:</para>
+
+
+<screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib
+mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
+
   </sect2>
 

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

@@ -43 +43 @@
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gettext.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 

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

@@ -44 +44 @@
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gettext.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 

BOOK/final-system/multilib/gettext.xml

@@ -42 +42 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gettext.xml"

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

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

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

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

BOOK/final-system/multilib/gmp.xml

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

BOOK/final-system/multilib/grep.xml

@@ -27 +27 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --bindir=/bin --without-included-regex</userinput></screen>
+   --bindir=/bin</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -40 +40 @@
     href="../common/grep.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/gzip.xml

@@ -42 +42 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gzip.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 

BOOK/final-system/multilib/iproute2.xml

@@ -29 +29 @@
     href="../common/iproute2.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/iproute2.xml"
+    xpointer="xpointer(//*[@os='f1'])"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/iproute2.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <para os="p1">This patch adds the ability to update the LIBDIR path:</para>

BOOK/final-system/multilib/iputils.xml

@@ -32 +32 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/iputils.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iputils.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/iputils.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" IPV4_TARGETS="tracepath ping clockdiff" \
+<screen os="b"><userinput>make USE_CAP=no CC="gcc ${BUILD64}" \
+    IPV4_TARGETS="tracepath ping clockdiff rdisc" \
     IPV6_TARGETS="tracepath6 traceroute6"</userinput></screen>
 

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

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-module-init-tools" role="wrap">
-  <?dbhtml filename="module-init-tools.html"?>
+<sect1 id="ch-system-isl" role="wrap">
+  <?dbhtml filename="isl-64bit.html"?>
 
-  <title>Module-Init-Tools-&module-init-tools-version;</title>
+  <title>ISL-&isl-version; 64 Bit</title>
 
-  <indexterm zone="ch-system-module-init-tools">
-    <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
+  <indexterm zone="ch-system-isl">
+    <primary sortas="a-ISL">ISL</primary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/module-init-tools.xml"
+  href="../common/isl.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of Module-Init-Tools</title>
+    <title>Installation of ISL</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/isl.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
+  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --bindir=/bin --sbindir=/sbin \
-    --enable-zlib-dynamic</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/isl.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
+<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib64
+mv -v /usr/lib64/*gdb.py /usr/share/gdb/auto-load/usr/lib64</userinput></screen>
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/module-init-tools.xml"
-  xpointer="xpointer(id('contents-module-init-tools'))"/>
+  href="../common/isl.xml"
+  xpointer="xpointer(id('contents-isl'))"/>
 
 </sect1>

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

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-ppl-n32" role="wrap">
-  <?dbhtml filename="ppl-n32.html"?>
+<sect1 id="ch-system-isl-n32" role="wrap">
+  <?dbhtml filename="isl-n32.html"?>
 
-  <title>PPL-&ppl-version; N32 Libraries</title>
+  <title>ISL-&isl-version; N32 Libraries</title>
 
-  <indexterm zone="ch-system-ppl-n32">
-    <primary sortas="a-PPL">PPL</primary>
+  <indexterm zone="ch-system-isl-n32">
+    <primary sortas="a-ISL">ISL</primary>
     <secondary>N32</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/ppl.xml"
+  href="../common/isl.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of PPL</title>
+    <title>Installation of ISL</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILDN32}" \
-CXX="g++ -isystem /usr/include ${BUILDN32}" \
+<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-    --enable-shared --disable-optimization</userinput></screen>
+  ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ppl.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    href="../common/isl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-n32}</userinput></screen>
-
-    <para os="j">Create the N32 header file:</para>
-
-<screen os="k"><userinput>mv -v /usr/include/ppl{,-n32}.hh</userinput></screen>
-
+<screen os="k"><userinput>mkdir -pv /usr/share/gdb/auto-load/usr/lib32
+mv -v /usr/lib32/*gdb.py /usr/share/gdb/auto-load/usr/lib32</userinput></screen>
   </sect2>
 
@@ -77 +71 @@
 
     <para>Details on this package are located in <xref
-    linkend="contents-ppl" role="."/></para>
+    linkend="contents-isl" role="."/></para>
 
   </sect2>

BOOK/final-system/multilib/kbd.xml

@@ -24 +24 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kbd.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="/tools/lib64/pkgconfig" \
+    ./configure --prefix=/usr --disable-vlock --enable-optional-progs</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -40 +33 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -36 +36 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='n1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 

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

@@ -37 +37 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='n1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 

BOOK/final-system/multilib/libee.xml

@@ -36 +36 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libee.xml"
+    xpointer="xpointer(//*[@os='n1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libee.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 

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

@@ -49 +49 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/libtool.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
@@ -60 +64 @@
 
 <screen os="m2"><userinput>mv -v /usr/bin/libtool{,-64}
-ln -s multiarch_wrapper /usr/bin/libtool</userinput></screen>
+ln -sv multiarch_wrapper /usr/bin/libtool</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/make.xml

@@ -42 +42 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/make.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/make.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 

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

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

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

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

BOOK/final-system/multilib/mpc.xml

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

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

@@ -21 +21 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/mpfr.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/mpfr.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/mpfr.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/mpfr.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/mpfr.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/mpfr.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/mpfr.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/multiarch_wrapper.xml

@@ -91 +91 @@
 <screen os="g"><userinput>echo 'echo "32bit Version"' &gt; test-32
 echo 'echo "64bit Version"' &gt; test-64
-chmod 755 test-32 test-64
+chmod -v 755 test-32 test-64
 ln -sv /usr/bin/multiarch_wrapper test</userinput></screen>
 
@@ -103 +103 @@
 <screen os="k" role="nodump"><userinput>32bit Version
 64bit Version</userinput></screen>
+
+    <para os="l">Remove the testcase source, binaries, and link:</para>
+
+<screen os="m"><userinput>rm -v multiarch_wrapper.c test{,-32,-64}</userinput></screen>
 
   </sect2>

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

@@ -37 +37 @@
    ./configure --prefix=/usr --libdir=/lib64 \
    --with-shared --without-debug --enable-widec \
-   --with-manpage-format=normal</userinput></screen>
+   --with-manpage-format=normal \
+   --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -38 +38 @@
    ./configure --prefix=/usr --libdir=/lib32 \
    --with-shared --without-debug --enable-widec \
-   --with-manpage-format=normal</userinput></screen>
+   --with-manpage-format=normal \
+   --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/ncurses.xml

@@ -38 +38 @@
    ./configure --prefix=/usr --libdir=/lib \
    --with-shared --without-debug --enable-widec \
-   --with-manpage-format=normal</userinput></screen>
+   --with-manpage-format=normal \
+   --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/patch.xml

@@ -42 +42 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/patch.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 

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

@@ -102 +102 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='h2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/perl.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 

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

@@ -105 +105 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='h2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/perl.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 

BOOK/final-system/multilib/perl.xml

@@ -45 +45 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='a03'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/perl.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -73 +77 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='h2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/perl.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 

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

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-pkg-config" role="wrap">
-  <?dbhtml filename="pkg-config.html"?>
+<sect1 id="ch-system-pkg-config-lite" role="wrap">
+  <?dbhtml filename="pkg-config-lite.html"?>
 
-  <title>Pkg-config-&pkg-config-version;</title>
+  <title>Pkg-config-lite-&pkg-config-lite-version;</title>
 
-  <indexterm zone="ch-system-pkg-config">
-    <primary sortas="a-Pkg-config">Pkg-config</primary>
+  <indexterm zone="ch-system-pkg-config-lite">
+    <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/pkg-config.xml"
+  href="../common/pkg-config-lite.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of Pkg-config</title>
+    <title>Installation of Pkg-config-lite</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config.xml"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include" \
-  GLIB_LIBS="-lglib-2.0" \
-  CC="gcc ${BUILD64}" \
-  ./configure --prefix=/usr \
-    --with-pc-path=/usr/share/pkgconfig </userinput></screen>
-
-    <variablelist os="bb">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/libi64/glib-2.0/include"</parameter></term>
-        <term><parameter>GLIB_LIBS="-lglib-2.0"</parameter></term>
-        <listitem>
-          <para>Pkg-config no longer comes with Glib and because Pkg-config
-        has not been installed itself it needs to be told where Glib is.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --with-pc-path=/usr/share/pkgconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config.xml"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config.xml"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config.xml"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config.xml"
+    href="../common/pkg-config-lite.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config.xml"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
@@ -76 +63 @@
     future.</para>
 
-<screen os="m4"><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
+<screen os="m4"><userinput>cat &gt;&gt; /root/.bash_profile &lt;&lt; EOF
 export PKG_CONFIG_PATH32="${PKG_CONFIG_PATH32}"
 export PKG_CONFIG_PATH64="${PKG_CONFIG_PATH64}"
@@ -84 +71 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/pkg-config.xml"
-  xpointer="xpointer(id('contents-pkg-config'))"/>
+  href="../common/pkg-config-lite.xml"
+  xpointer="xpointer(id('contents-pkg-config-lite'))"/>
 
 </sect1>

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

@@ -32 +32 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/procps.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
@@ -52 +60 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="e"><userinput>make install lib64=lib64</userinput></screen>
+<screen os="e"><userinput>make SKIP='/bin/kill /usr/share/man/man1/kill.1' install lib64=lib64</userinput></screen>
 
     <variablelist os="f">

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

@@ -33 +33 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/procps.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
@@ -54 +62 @@
 
 
-<screen os="e"><userinput>make install lib64=lib32</userinput></screen>
+<screen os="e"><userinput>make SKIP='/bin/kill /usr/share/man/man1/kill.1' install lib64=lib32</userinput></screen>
 
     <variablelist os="f">

BOOK/final-system/multilib/procps.xml

@@ -33 +33 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/procps.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/procps.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
@@ -53 +61 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="e"><userinput>make install lib64=lib</userinput></screen>
+<screen os="e"><userinput>make SKIP='/bin/kill /usr/share/man/man1/kill.1' install lib64=lib</userinput></screen>
 
     <variablelist os="f">

BOOK/final-system/multilib/rsyslog.xml

@@ -43 +43 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/rsyslog.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/rsyslog.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 

BOOK/final-system/multilib/sed.xml

@@ -51 +51 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='g2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/sed.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 

BOOK/final-system/multilib/shadow.xml

@@ -30 +30 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --sysconfdir=/etc \
-   --without-libpam --without-audit --without-selinux</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -37 +38 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --sysconfdir=/etc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/sysvinit.xml

@@ -20 +20 @@
   <sect2 role="installation">
     <title>Installation of Sysvinit</title>
+  
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/tar.xml

@@ -52 +52 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/tar.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
@@ -57 +61 @@
     href="../common/tar.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>

BOOK/final-system/multilib/texinfo.xml

@@ -24 +24 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -47 +39 @@
     href="../common/texinfo.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -31 +31 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
-    --enable-partx --disable-wall --enable-write</userinput></screen>
+    --enable-write</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -48 +48 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -28 +28 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
-    --enable-partx --disable-wall --enable-write</userinput></screen>
+    --enable-write</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -45 +45 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -9 +9 @@
   <?dbhtml filename="util-linux.html"?>
 
-  <title>Util-linux-&util-linux-version;</title>
+  <title>Util-linux-&util-linux-version; 32 Bit</title>
 
   <indexterm zone="ch-system-util-linux-32">
@@ -28 +28 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
-    --enable-partx --disable-wall --enable-write</userinput></screen>
+    --enable-write</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -44 +44 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='dummy1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='dummy2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -53 +65 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>

BOOK/final-system/multilib/vim.xml

@@ -68 +68 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='i2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='i3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 

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

@@ -26 +26 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -42 +42 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="xz.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="xz.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
@@ -49 +53 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
+    href="../common/xz.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
+    href="../common/xz.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
@@ -60 +64 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
-    <screen os="k"><userinput>mv -v /lib64/liblzma.a /usr/lib64</userinput></screen>
+<screen os="k"><userinput>mv -v /usr/lib64/liblzma.so.* /lib64
+ln -svf ../../lib64/liblzma.so.&xz-version; /usr/lib64/liblzma.so</userinput></screen>
 
   </sect2>

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

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -43 +43 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="xz.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='e2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="xz.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="xz.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="g"><userinput>make install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -61 +55 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
+<screen os="k"><userinput>mv -v /usr/lib32/liblzma.so.* /lib32
+ln -svf ../../lib32/liblzma.so.&xz-version; /usr/lib32/liblzma.so</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/xz.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr libdir=/lib</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -43 +43 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/xz.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/xz.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
@@ -51 +55 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <para os="j">Move the static libraries to the proper location:</para>
-
-    <screen os="k"><userinput>mv -v /lib/liblzma.a /usr/lib</userinput></screen>
+    xpointer="xpointer(//*[@os='k'])"/>
 
   </sect2>

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

@@ -45 +45 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="zlib.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 

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

@@ -46 +46 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="zlib.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="zlib.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 

BOOK/final-system/multilib/zlib.xml

@@ -46 +46 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/zlib.xml"
     xpointer="xpointer(//*[@os='f'])"/>