Changeset 9597c5a for BOOK/boot/multilib/e2fsprogs.xml

Timestamp:

May 18, 2014, 8:25:27 PM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

5a951e7

Parents:

e8f3474

git-author:

Chris Staub <chris@…> (05/18/14 20:23:56)

git-committer:

Chris Staub <chris@…> (05/18/14 20:25:27)

Message:

Replaced PKG_CONFIG vars with pkg-config-lite installed in /cross-tools

Conflicts:

BOOK/introduction/common/changelog.xml

File:

• BOOK/boot/multilib/e2fsprogs.xml (modified) (2 diffs)

BOOK/boot/multilib/e2fsprogs.xml

@@ -41 +41 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
   ../configure --prefix=/tools --enable-elf-shlibs \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
@@ -55 +55 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
-    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" \
-    LDFLAGS="-Wl,-rpath,/tools/lib64"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"