Changeset 8b63746

Timestamp:

Aug 22, 2009, 3:32:56 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:

4f040a09

Parents:

935ecec

Message:

Put the libraries for Util-Linux-NG in the boot section where they're expected to be.

File:

• BOOK/boot/multilib/util-linux-ng.xml (modified) (2 diffs)

BOOK/boot/multilib/util-linux-ng.xml

@@ -28 +28 @@
 
 <screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --enable-login-utils \
+    --host=${CLFS_TARGET} --libdir=/lib64 --enable-login-utils \
     --disable-makeinstall-chown</userinput></screen>
 
@@ -51 +51 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+<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-ng-blkid-id; /tools/lib64/libblkid.so
+ln -sfv libuuid.so.&util-linux-ng-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>