Changeset 98c59fa for BOOK/final-system/multilib

Timestamp:

Jul 18, 2009, 4:41:58 PM (15 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

2f9a05f1

Parents:

bbb7784

Message:

use the libblkid and libuuid provided by Util-Linux-NG instead of E2fsprogs now.

Location:

BOOK/final-system/multilib

Files:

• e2fsprogs-64bit.xml (modified) (1 diff)
• e2fsprogs-n32.xml (modified) (1 diff)
• e2fsprogs.xml (modified) (1 diff)
• util-linux-ng-64bit.xml (added)
• util-linux-ng-n32.xml (added)
• util-linux-ng.xml (modified) (4 diffs)

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

@@ -39 +39 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ../configure --prefix=/usr \
-    --with-root-prefix="" --enable-elf-shlibs --with-cc="gcc ${BUILD64}"</userinput></screen>
+<screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG=true \
+    ../configure --prefix=/usr \
+    --with-root-prefix="" --enable-elf-shlibs --with-cc="gcc ${BUILD64}" \
+    --disable-libuuid --disable-libblkid</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

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

@@ -40 +40 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILDN32}" ../configure --prefix=/usr \
-    --with-root-prefix="" --enable-elf-shlibs --with-cc="gcc ${BUILDN32}"</userinput></screen>
+<screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG=true \
+    ../configure --prefix=/usr \
+    --with-root-prefix="" --enable-elf-shlibs --with-cc="gcc ${BUILDN32}" \
+    --disable-libuuid --disable-libblkid</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/multilib/e2fsprogs.xml

@@ -35 +35 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD32}" ../configure --prefix=/usr \
-    --with-root-prefix="" --enable-elf-shlibs --with-cc="gcc ${BUILD32}"</userinput></screen>
+<screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG=true \
+    ../configure --prefix=/usr \
+    --with-root-prefix="" --enable-elf-shlibs --with-cc="gcc ${BUILD32}" \
+    --disable-libuuid --disable-libblkid</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

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

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-util-linux-ng" role="wrap">
+<sect1 id="ch-system-util-linux-ng-32" role="wrap">
   <?dbhtml filename="util-linux-ng.html"?>
 
   <title>Util-linux-ng-&util-linux-ng-version;</title>
 
-  <indexterm zone="ch-system-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+  <indexterm zone="ch-system-util-linux-ng-32">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng 32 Bit Libraries</primary>
+    <secondary>32 Bit</secondary>
   </indexterm>
 
@@ -18 +19 @@
   href="../common/util-linux-ng.xml"
   xpointer="xpointer(//*[@role='package'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@id='fhs-util-linux-ng'])"/>
 
   <sect2 role="installation">
@@ -30 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
     --enable-partx --disable-wall --enable-write</userinput></screen>
 
@@ -67 +64 @@
   </sect2>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(id('contents-util-linux-ng'))"/>
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-util-linux-ng" role="."/></para>
+
+  </sect2>
 
 </sect1>