Changeset 0d11714

Timestamp:

Nov 9, 2013, 3:37:29 PM (11 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

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

Children:

fb8eaf3

Parents:

2dcee038

Message:

For hosts with pkg-config installed, fix an issue where the host's pkg-config is ran and causes util-linux to fail to configure and build properly, and set PKG_CONFIG= at configure time.

Location:

BOOK/boot

Files:

• 64/util-linux.xml (modified) (1 diff)
• common/util-linux.xml (modified) (1 diff)
• multilib/util-linux.xml (modified) (1 diff)
• ppc64/util-linux-32.xml (modified) (1 diff)

BOOK/boot/64/util-linux.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= \
   ./configure --prefix=/tools --exec-prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \

BOOK/boot/common/util-linux.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>PKG_CONFIG=true \
+<screen os="b"><userinput>PKG_CONFIG= \
   ./configure --prefix=/tools --exec-prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \

BOOK/boot/multilib/util-linux.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true ./configure \
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure \
     --prefix=/tools --exec-prefix="" --build=${CLFS_HOST} \
     --host=${CLFS_TARGET} --libdir=/tools/lib64 --bindir=/tools/bin \

BOOK/boot/ppc64/util-linux-32.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>CC="${CC} ${BUILD32}" PKG_CONFIG=true \
+<screen os="be"><userinput>CC="${CC} ${BUILD32}" PKG_CONFIG= \
   ./configure \
     --prefix=/tools --exec-prefix=/tools \