Changeset ec008670 for BOOK/boot/common

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/common

Files:

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

BOOK/boot/common/e2fsprogs.xml

@@ -35 +35 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib" \
-  PKG_CONFIG=true ../configure --prefix=/tools \
+<screen os="aa"><userinput>PKG_CONFIG=true \
+  ../configure --prefix=/tools \
     --enable-elf-shlibs --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --disable-libblkid --disable-libuuid --disable-fsck \
@@ -77 +77 @@
 <screen os="ae"><userinput>ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin</userinput></screen>
 
+
   </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>