Changes in BOOK/boot/multilib/util-linux.xml [7782c77:dabbced]

File:

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

BOOK/boot/multilib/util-linux.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<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 \
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} --libdir=/lib64 --enable-login-utils \
     --disable-makeinstall-chown</userinput></screen>
 
@@ -50 +47 @@
     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>