Changeset 27931b9 for BOOK/final-system/multilib

Timestamp:

Jan 30, 2011, 1:25:46 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

a4d251f, fd34dc3

Parents:

f586fdb

Message:

Remove the hackery from E2fsprogs that allows it to bypass pkg-config
and just rely on pkg-config now that we have it.

Location:

BOOK/final-system/multilib

Files:

• e2fsprogs-64bit.xml (modified) (1 diff)
• e2fsprogs-n32.xml (modified) (1 diff)
• e2fsprogs.xml (modified) (1 diff)

BOOK/final-system/multilib/e2fsprogs-64bit.xml

@@ -39 +39 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG=true \
-    ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+  ../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid \
     --disable-libuuid --disable-fsck \

BOOK/final-system/multilib/e2fsprogs-n32.xml

@@ -40 +40 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG=true \
-    ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
+  ../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid \
     --disable-libuuid --disable-fsck \

BOOK/final-system/multilib/e2fsprogs.xml

@@ -35 +35 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG=true \
-    ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
+  ../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid \
     --disable-libuuid --disable-fsck \