Changeset 6c19f5e for BOOK/boot/ppc64

Timestamp:

May 18, 2014, 8:23:56 PM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, master, systemd

Children:

f319d64

Parents:

6eb13f4

Message:

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

Location:

BOOK/boot/ppc64

Files:

• e2fsprogs-libs.xml (modified) (2 diffs)
• e2fsprogs.xml (modified) (2 diffs)

BOOK/boot/ppc64/e2fsprogs-libs.xml

@@ -46 +46 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>CC="${CC} ${BUILD32}" PKG_CONFIG=true \
+<screen os="aa"><userinput>CC="${CC} ${BUILD32}" \
   ../configure --prefix=/tools --enable-elf-shlibs \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
@@ -60 +60 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
-    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" libs</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"

BOOK/boot/ppc64/e2fsprogs.xml

@@ -54 +54 @@
     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} \
@@ -68 +68 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
-    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" libs
-make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" LIBBLKID="-lblkid" \
-    STATIC_LIBBLKID="-lblkid" LDFLAGS="-Wl,-rpath,/tools/lib64" -C e2fsck/</userinput></screen>
+<screen os="g"><userinput>make libs
+make -C e2fsck/</userinput></screen>
 
     <para os="i">Install the e2fsck binary:</para>