Changeset ec008670 for BOOK/boot/multilib

Timestamp:

Jun 4, 2011, 8:30:53 AM (13 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

229ed25

Parents:

cfb2026a (diff), 622df7bc (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:

Merge branch 'master' into systemd

Location:

BOOK/boot/multilib

Files:

• e2fsprogs.xml (modified) (1 diff)
• util-linux.xml (modified) (2 diffs)

BOOK/boot/multilib/e2fsprogs.xml

@@ -41 +41 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib64" \
-  CC="${CC} ${BUILD64}" PKG_CONFIG=true \
-    ../configure --prefix=/tools --enable-elf-shlibs \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+  ../configure --prefix=/tools --enable-elf-shlibs \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --disable-libblkid --disable-libuuid --disable-fsck \

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>