Changeset 7782c77

Timestamp:

Jun 4, 2011, 8:24:34 AM (14 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:

04b4d8a

Parents:

d63b7ee

Message:

Cleanup Util-Linux-NG in the boot section.

Location:

BOOK/boot

Files:

• 64/util-linux.xml (modified) (2 diffs)
• common/util-linux.xml (modified) (2 diffs)
• multilib/util-linux.xml (modified) (2 diffs)

BOOK/boot/64/util-linux.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --enable-login-utils \
-    --disable-makeinstall-chown</userinput></screen>
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+  ./configure --prefix=/tools --exec-prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --enable-login-utils --disable-makeinstall-chown</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -47 +48 @@
     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/boot/common/util-linux.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>./configure --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --enable-login-utils \
-    --disable-makeinstall-chown</userinput></screen>
+<screen os="b"><userinput>PKG_CONFIG=true \
+  ./configure --prefix=/tools --exec-prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --enable-login-utils --disable-makeinstall-chown</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -41 +42 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
-
-  <para os="i">Copy Libraries and includes to /tools:</para>
-
-<screen os="j"><userinput>rm -fv ${CLFS}/usr/lib/lib{blkid,uuid}.la
-cp -v ${CLFS}/usr/lib/lib{blkid,uuid}* /tools/lib
-cp -v ${CLFS}/lib/lib{blkid,uuid}* /tools/lib
-ln -sfv libblkid.so.&util-linux-blkid-id; /tools/lib/libblkid.so
-ln -sfv libuuid.so.&util-linux-uuid-id; /tools/lib/libuuid.so
-install -dv /tools/include/{blkid,uuid}
-cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
-cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
   </sect2>

BOOK/boot/multilib/util-linux.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --libdir=/lib64 --enable-login-utils \
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+  ./configure \
+    --prefix=/tools --exec-prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --libdir=/tools/lib64 --enable-login-utils \
     --disable-makeinstall-chown</userinput></screen>
 
@@ -47 +50 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>rm -fv ${CLFS}/usr/lib64/lib{blkid,uuid}.la
-cp -v ${CLFS}/usr/lib64/lib{blkid,uuid}* /tools/lib64
-cp -v ${CLFS}/lib64/lib{blkid,uuid}* /tools/lib64
-ln -sfv libblkid.so.&util-linux-blkid-id; /tools/lib64/libblkid.so
-ln -sfv libuuid.so.&util-linux-uuid-id; /tools/lib64/libuuid.so
-install -dv /tools/include/{blkid,uuid}
-cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
-cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
-
   </sect2>