diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index d1aede383..c0fb368b9 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -404,7 +404,7 @@
Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
- Gzip, Make, Pkg-config, Sed, Texinfo, and Util-linux
+ Gzip, Make, Sed, Texinfo, and Util-linux
@@ -686,42 +686,6 @@
-
- Glib
-
-
- &dependencies;
-
-
- Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, PCRE
- Sed, and Texinfo
-
-
-
-
- &testsuites;
-
-
- None
-
-
-
-
- &before;
-
-
- None
-
-
-
-
- &external;
-
-
- None
-
-
-
Glibc
@@ -1548,42 +1512,6 @@
-
- PCRE
-
-
- &dependencies;
-
-
- Bash, Binutils, Bzip2, Coreutils, Gawk, GCC, Glibc, Grep, Make, Sed, and
- Texinfo
-
-
-
-
- &testsuites;
-
-
- None
-
-
-
-
- &before;
-
-
- None
-
-
-
-
- &external;
-
-
- None
-
-
-
Perl
@@ -1620,42 +1548,6 @@
-
- Pkg-config
-
-
- &dependencies;
-
-
- Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glib, Glibc,
- Grep, Make, and Sed
-
-
-
-
- &testsuites;
-
-
- None
-
-
-
-
- &before;
-
-
- None
-
-
-
-
- &external;
-
-
- None
-
-
-
Procps
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6fd4daedc..1782ba264 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
-->
+
+ 2011-10-07
+
+
+ [matthew] - Remove Pkg-Config, and its dependencies PCRE and
+ Glib. E2fsprogs, Man-DB and Udev can all be built without Pkg-Config,
+ and later Glib versions are becoming a little much for LFS.
+
+
+
+
2011-10-06
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index b7148380c..5fc543cf4 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -169,9 +169,6 @@
-
- Pkg-config &pkg-config-version;
-
Psmisc &psmisc-version;
@@ -242,9 +239,6 @@
&gcc-startfiles-patch;
-
- Glib-&glib-version;
-
&glibc-fixes-patch;
@@ -260,9 +254,6 @@
&mpfr-fixes-patch;
-
- PCRE-&pcre-version;
-
perl-5.14.1-libc-1.patch
@@ -291,6 +282,9 @@
perl-5.12.3-libc-1.patch
+
+ Pkg-Config-0.25
+
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index daebebe02..fdac460d4 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -185,15 +185,6 @@
-
- Glib (&glib-version;) - &glib-size;:
-
- Home page:
- Download:
- MD5 sum: &glib-md5;
-
-
-
Glibc (&glibc-version;) - &glibc-size;:
@@ -449,15 +440,6 @@
-
- PCRE (&pcre-version;) - &pcre-size;:
-
- Home page:
- Download:
- MD5 sum: &pcre-md5;
-
-
-
Perl (&perl-version;) - &perl-size;:
@@ -467,15 +449,6 @@
-
- Pkg-config (&pkg-config-version;) - &pkg-config-size;:
-
- Home page:
- Download:
- MD5 sum: &pkg-config-md5;
-
-
-
Procps (&procps-version;) - &procps-size;:
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 @@
-
-
-
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
Prepare E2fsprogs for compilation:
-../configure --prefix=/usr --with-root-prefix="" \
+PKG_CONFIG=/tools/bin/true LDFLAGS=-lblkid \
+ ../configure --prefix=/usr --with-root-prefix="" \
--enable-elf-shlibs --disable-libblkid --disable-libuuid \
--disable-uuidd --disable-fsck
The meaning of the configure options:
+
+ PKG_CONFIG...
+
+ This enables E2fsprogs to be built without requiring Pkg-config
+ to be built and installed first.
+
+
+
--with-root-prefix=""
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 @@
Prepare Man-DB for compilation:
-./configure --prefix=/usr --libexecdir=/usr/lib \
+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
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
--sysconfdir=/etc --sbindir=/sbin \
--with-rootlibdir=/lib --libexecdir=/lib/udev \
--disable-hwdb --disable-introspection \
- --disable-keymap
+ --disable-keymap --disable-gudev
The meaning of the new configure options
diff --git a/general.ent b/general.ent
index f622d36f6..e98463e82 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/packages.ent b/packages.ent
index 813fcfb12..b2cbef24c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -194,14 +194,6 @@
-
-
-
-
-
-
-
-
@@ -423,15 +415,6 @@
-
-
-
-
-
-
-
-
-
@@ -442,16 +425,6 @@
-
-
-
-
-
-
-
-
-
-