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

appendices/dependencies.xml

@@ -404,7 +404,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-         Gzip, Make, Pkg-config, Sed, Texinfo, and Util-linux</seg>
+         Gzip, Make, Sed, Texinfo, and Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -686,42 +686,6 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Glib dependency info -->
-  <bridgehead renderas="sect2" id="glib-dep">Glib</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, PCRE
-         Sed, and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&external;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Glibc dependency info -->
   <bridgehead renderas="sect2" id="glibc-dep">Glibc</bridgehead>
 
@@ -1548,42 +1512,6 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin PCRE dependency info -->
-  <bridgehead renderas="sect2" id="pcre-dep">PCRE</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Bzip2, Coreutils, Gawk, GCC, Glibc, Grep, Make, Sed, and
-         Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&external;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Perl dependency info -->
   <bridgehead renderas="sect2" id="perl-dep">Perl</bridgehead>
 
@@ -1620,42 +1548,6 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Pkg-config dependency info -->
-  <bridgehead renderas="sect2" id="pkg-config-dep">Pkg-config</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glib, Glibc,
-         Grep, Make, and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&external;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Procps dependency info -->
   <bridgehead renderas="sect2" id="procps-dep">Procps</bridgehead>
 

chapter01/changelog.xml

@@ -36,6 +36,17 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2011-10-07</para>
+      <itemizedlist>
+        <listitem>
+          <para>[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.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2011-10-06</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -169,9 +169,6 @@
     <!--<listitem>
       <para>Procps &procps-version;</para>
     </listitem>-->
-    <listitem>
-      <para>Pkg-config &pkg-config-version;</para>
-    </listitem>
     <listitem>
       <para>Psmisc &psmisc-version;</para>
     </listitem>
@@ -242,9 +239,6 @@
     <listitem>
       <para>&gcc-startfiles-patch;</para>
     </listitem>
-    <listitem>
-      <para>Glib-&glib-version;</para>
-    </listitem>
     <listitem>
       <para>&glibc-fixes-patch;</para>
     </listitem>
@@ -260,9 +254,6 @@
     <listitem>
       <para>&mpfr-fixes-patch;</para>
     </listitem>
-    <listitem>
-      <para>PCRE-&pcre-version;</para>
-    </listitem>
     <listitem>
       <para>perl-5.14.1-libc-1.patch</para>
     </listitem>
@@ -291,6 +282,9 @@
     <listitem>
       <para>perl-5.12.3-libc-1.patch</para>
     </listitem>
+    <listitem>
+      <para>Pkg-Config-0.25</para>
+    </listitem>
   </itemizedlist>
 
 </sect1>

chapter03/packages.xml

@@ -185,15 +185,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Glib (&glib-version;) - <token>&glib-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&glib-home;"/></para>
-        <para>Download: <ulink url="&glib-url;"/></para>
-        <para>MD5 sum: <literal>&glib-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Glibc (&glibc-version;) - <token>&glibc-size;</token>:</term>
       <listitem>
@@ -449,15 +440,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>PCRE (&pcre-version;) - <token>&pcre-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&pcre-home;"/></para>
-        <para>Download: <ulink url="&pcre-url;"/></para>
-        <para>MD5 sum: <literal>&pcre-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Perl (&perl-version;) - <token>&perl-size;</token>:</term>
       <listitem>
@@ -467,15 +449,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Pkg-config (&pkg-config-version;) - <token>&pkg-config-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&pkg-config-home;"/></para>
-        <para>Download: <ulink url="&pkg-config-url;"/></para>
-        <para>MD5 sum: <literal>&pkg-config-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Procps (&procps-version;) - <token>&procps-size;</token>:</term>
       <listitem>

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"/>

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>

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>

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>

general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20111006">
-<!ENTITY releasedate "Oct 6, 2011">
+<!ENTITY version "SVN-20111007">
+<!ENTITY releasedate "Oct 7, 2011">
 <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

packages.ent

@@ -194,14 +194,6 @@
 <!ENTITY gettext-ch6-du "125 MB">
 <!ENTITY gettext-ch6-sbu "5.8 SBU">
 
-<!ENTITY glib-version "2.28.8">
-<!ENTITY glib-size "6,854 KB">
-<!ENTITY glib-url "http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-&glib-version;.tar.bz2">
-<!ENTITY glib-md5 "789e7520f71c6a4bf08bc683ec764d24">
-<!ENTITY glib-home "http://developer.gnome.org/glib/">
-<!ENTITY glib-ch6-du "157 MB">
-<!ENTITY glib-ch6-sbu "1.3 SBU">
-
 <!ENTITY glibc-version "2.14">
 <!ENTITY glibc-size "15,265 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
@@ -423,15 +415,6 @@
 <!ENTITY patch-ch6-du "1.9 MB">
 <!ENTITY patch-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY pcre-version "8.12">
-<!ENTITY pcre-size "969 KB">
-<!ENTITY pcre-url "&sourceforge;pcre/pcre-&pcre-version;.tar.bz2">
-<!ENTITY pcre-url "">
-<!ENTITY pcre-md5 "f14a9fef3c92f3fc6c5ac92d7a2c7eb3">
-<!ENTITY pcre-home "http://www.pcre.org/">
-<!ENTITY pcre-ch6-du "12 MB">
-<!ENTITY pcre-ch6-sbu "0.4 SBU">
-
 <!ENTITY perl-version "5.14.2">
 <!ENTITY perl-size "12,917 KB">
 <!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.bz2">
@@ -442,16 +425,6 @@
 <!ENTITY perl-ch6-du "235 MB">
 <!ENTITY perl-ch6-sbu "7.6 SBU">
 
-<!ENTITY pkg-config-version "0.26">
-<!ENTITY pkg-config-size "387 KB">
-<!ENTITY pkg-config-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkg-config-version;.tar.gz">
-<!ENTITY pkg-config-md5 "47525c26a9ba7ba14bf85e01509a7234">
-<!ENTITY pkg-config-home "http://pkg-config.freedesktop.org/">
-<!ENTITY pkg-config-ch5-du " MB">
-<!ENTITY pkg-config-ch5-sbu " SBU">
-<!ENTITY pkg-config-ch6-du "11.5 MB">
-<!ENTITY pkg-config-ch6-sbu "0.3 SBU">
-
 <!ENTITY procps-version "3.2.8">
 <!ENTITY procps-size "279 KB">
 <!ENTITY procps-url "http://procps.sourceforge.net/procps-&procps-version;.tar.gz">