From 374259a011dd7bdecc2404d627d448dfd0309508 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Fri, 7 Oct 2011 19:16:12 +0000
Subject: Remove Pkg-Config and its dependencies PCRE and Glib.  Glib's
 dependencies are becoming too heavyweight for LFS to be incorporating.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9616 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/chapter06.xml |  3 ---
 chapter06/e2fsprogs.xml | 11 ++++++++++-
 chapter06/man-db.xml    |  3 ++-
 chapter06/udev.xml      |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 899ab5446..0c6a7236e 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -30,9 +30,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcre.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkg-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 75eeb28d4..09a04642d 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -52,13 +52,22 @@ cd build</userinput></screen>
 
     <para>Prepare E2fsprogs for compilation:</para>
 
-<screen><userinput remap="configure">../configure --prefix=/usr --with-root-prefix="" \
+<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true LDFLAGS=-lblkid \
+    ../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-libblkid --disable-libuuid \
     --disable-uuidd --disable-fsck</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
 
+      <varlistentry>
+        <term><parameter>PKG_CONFIG...</parameter></term>
+        <listitem>
+          <para>This enables E2fsprogs to be built without requiring Pkg-config
+          to be built and installed first.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>--with-root-prefix=""</parameter></term>
         <listitem>
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index f61f62fd0..a1b27367a 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -43,7 +43,8 @@
 
     <para>Prepare Man-DB for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib \
+<screen><userinput remap="configure">libpipeline_CFLAGS='' libpipeline_LIBS='-lpipeline' \
+    ./configure --prefix=/usr --libexecdir=/usr/lib \
     --docdir=/usr/share/doc/man-db-&man-db-version; --sysconfdir=/etc \
     --disable-setuid --with-browser=/usr/bin/lynx \
     --with-vgrind=/usr/bin/vgrind --with-grap=/usr/bin/grap</userinput></screen>
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 275878105..2bbf2743f 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -71,7 +71,7 @@ mknod -m0666 /lib/udev/devices/null c 1 3</userinput></screen>
     --sysconfdir=/etc --sbindir=/sbin \
     --with-rootlibdir=/lib --libexecdir=/lib/udev \
     --disable-hwdb --disable-introspection \
-    --disable-keymap</userinput></screen>
+    --disable-keymap --disable-gudev</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options</title>
-- 
cgit v1.2.3-54-g00ecf