Changeset 374259a0


Ignore:
Timestamp:
10/07/2011 07:16:12 PM (13 years ago)
Author:
Matthew Burgess <matthew@…>
Branches:
10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
3fffa40
Parents:
81060b6
Message:

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

Files:
10 edited

Legend:

Unmodified
Added
Removed

  • appendices/dependencies.xml

    r81060b6 r374259a0  
    405405        <seglistitem>
    406406         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
    407          Gzip, Make, Pkg-config, Sed, Texinfo, and Util-linux</seg>
     407         Gzip, Make, Sed, Texinfo, and Util-linux</seg>
    408408        </seglistitem>
    409409      </segmentedlist>
    … …  
    687687      </segmentedlist>
    688688
    689 <!-- Begin Glib dependency info -->
    690   <bridgehead renderas="sect2" id="glib-dep">Glib</bridgehead>
    691 
    692       <segmentedlist>
    693         <segtitle>&dependencies;</segtitle>
    694 
    695         <seglistitem>
    696          <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, PCRE
    697          Sed, and Texinfo</seg>
    698         </seglistitem>
    699       </segmentedlist>
    700 
    701       <segmentedlist>
    702         <segtitle>&testsuites;</segtitle>
    703 
    704         <seglistitem>
    705           <seg>None</seg>
    706         </seglistitem>
    707       </segmentedlist>
    708 
    709       <segmentedlist>
    710         <segtitle>&before;</segtitle>
    711 
    712         <seglistitem>
    713           <seg>None</seg>
    714         </seglistitem>
    715       </segmentedlist>
    716 
    717       <segmentedlist>
    718         <segtitle>&external;</segtitle>
    719 
    720         <seglistitem>
    721           <seg>None</seg>
    722         </seglistitem>
    723       </segmentedlist>
    724 
    725689<!-- Begin Glibc dependency info -->
    726690  <bridgehead renderas="sect2" id="glibc-dep">Glibc</bridgehead>
    … …  
    15491513      </segmentedlist>
    15501514
    1551 <!-- Begin PCRE dependency info -->
    1552   <bridgehead renderas="sect2" id="pcre-dep">PCRE</bridgehead>
    1553 
    1554       <segmentedlist>
    1555         <segtitle>&dependencies;</segtitle>
    1556 
    1557         <seglistitem>
    1558          <seg>Bash, Binutils, Bzip2, Coreutils, Gawk, GCC, Glibc, Grep, Make, Sed, and
    1559          Texinfo</seg>
    1560         </seglistitem>
    1561       </segmentedlist>
    1562 
    1563       <segmentedlist>
    1564         <segtitle>&testsuites;</segtitle>
    1565 
    1566         <seglistitem>
    1567           <seg>None</seg>
    1568         </seglistitem>
    1569       </segmentedlist>
    1570 
    1571       <segmentedlist>
    1572         <segtitle>&before;</segtitle>
    1573 
    1574         <seglistitem>
    1575           <seg>None</seg>
    1576         </seglistitem>
    1577       </segmentedlist>
    1578 
    1579       <segmentedlist>
    1580         <segtitle>&external;</segtitle>
    1581 
    1582         <seglistitem>
    1583           <seg>None</seg>
    1584         </seglistitem>
    1585       </segmentedlist>
    1586 
    15871515<!-- Begin Perl dependency info -->
    15881516  <bridgehead renderas="sect2" id="perl-dep">Perl</bridgehead>
    … …  
    16211549      </segmentedlist>
    16221550
    1623 <!-- Begin Pkg-config dependency info -->
    1624   <bridgehead renderas="sect2" id="pkg-config-dep">Pkg-config</bridgehead>
    1625 
    1626       <segmentedlist>
    1627         <segtitle>&dependencies;</segtitle>
    1628 
    1629         <seglistitem>
    1630          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glib, Glibc,
    1631          Grep, Make, and Sed</seg>
    1632         </seglistitem>
    1633       </segmentedlist>
    1634 
    1635       <segmentedlist>
    1636         <segtitle>&testsuites;</segtitle>
    1637 
    1638         <seglistitem>
    1639           <seg>None</seg>
    1640         </seglistitem>
    1641       </segmentedlist>
    1642 
    1643       <segmentedlist>
    1644         <segtitle>&before;</segtitle>
    1645 
    1646         <seglistitem>
    1647           <seg>None</seg>
    1648         </seglistitem>
    1649       </segmentedlist>
    1650 
    1651       <segmentedlist>
    1652         <segtitle>&external;</segtitle>
    1653 
    1654         <seglistitem>
    1655           <seg>None</seg>
    1656         </seglistitem>
    1657       </segmentedlist>
    1658 
    16591551<!-- Begin Procps dependency info -->
    16601552  <bridgehead renderas="sect2" id="procps-dep">Procps</bridgehead>

  • chapter01/changelog.xml

    r81060b6 r374259a0  
    3737
    3838-->
     39    <listitem>
     40      <para>2011-10-07</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[matthew] - Remove Pkg-Config, and its dependencies PCRE and
     44          Glib.  E2fsprogs, Man-DB and Udev can all be built without Pkg-Config,
     45          and later Glib versions are becoming a little much for LFS.</para>
     46        </listitem>
     47      </itemizedlist>
     48    </listitem>
     49
    3950    <listitem>
    4051      <para>2011-10-06</para>

  • chapter01/whatsnew.xml

    r81060b6 r374259a0  
    171171    </listitem>-->
    172172    <listitem>
    173       <para>Pkg-config &pkg-config-version;</para>
    174     </listitem>
    175     <listitem>
    176173      <para>Psmisc &psmisc-version;</para>
    177174    </listitem>
    … …  
    244241    </listitem>
    245242    <listitem>
    246       <para>Glib-&glib-version;</para>
    247     </listitem>
    248     <listitem>
    249243      <para>&glibc-fixes-patch;</para>
    250244    </listitem>
    … …  
    260254    <listitem>
    261255      <para>&mpfr-fixes-patch;</para>
    262     </listitem>
    263     <listitem>
    264       <para>PCRE-&pcre-version;</para>
    265256    </listitem>
    266257    <listitem>
    … …  
    292283      <para>perl-5.12.3-libc-1.patch</para>
    293284    </listitem>
     285    <listitem>
     286      <para>Pkg-Config-0.25</para>
     287    </listitem>
    294288  </itemizedlist>
    295289

  • chapter03/packages.xml

    r81060b6 r374259a0  
    187187
    188188    <varlistentry>
    189       <term>Glib (&glib-version;) - <token>&glib-size;</token>:</term>
    190       <listitem>
    191         <para>Home page: <ulink url="&glib-home;"/></para>
    192         <para>Download: <ulink url="&glib-url;"/></para>
    193         <para>MD5 sum: <literal>&glib-md5;</literal></para>
    194       </listitem>
    195     </varlistentry>
    196 
    197     <varlistentry>
    198189      <term>Glibc (&glibc-version;) - <token>&glibc-size;</token>:</term>
    199190      <listitem>
    … …  
    451442
    452443    <varlistentry>
    453       <term>PCRE (&pcre-version;) - <token>&pcre-size;</token>:</term>
    454       <listitem>
    455         <para>Home page: <ulink url="&pcre-home;"/></para>
    456         <para>Download: <ulink url="&pcre-url;"/></para>
    457         <para>MD5 sum: <literal>&pcre-md5;</literal></para>
    458       </listitem>
    459     </varlistentry>
    460 
    461     <varlistentry>
    462444      <term>Perl (&perl-version;) - <token>&perl-size;</token>:</term>
    463445      <listitem>
    … …  
    465447        <para>Download: <ulink url="&perl-url;"/></para>
    466448        <para>MD5 sum: <literal>&perl-md5;</literal></para>
    467       </listitem>
    468     </varlistentry>
    469 
    470     <varlistentry>
    471       <term>Pkg-config (&pkg-config-version;) - <token>&pkg-config-size;</token>:</term>
    472       <listitem>
    473         <para>Home page: <ulink url="&pkg-config-home;"/></para>
    474         <para>Download: <ulink url="&pkg-config-url;"/></para>
    475         <para>MD5 sum: <literal>&pkg-config-md5;</literal></para>
    476449      </listitem>
    477450    </varlistentry>

  • chapter06/chapter06.xml

    r81060b6 r374259a0  
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
    3232  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
    33   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcre.xml"/>
    34   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib.xml"/>
    35   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkg-config.xml"/>
    3633  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
    3734  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>

  • chapter06/e2fsprogs.xml

    r81060b6 r374259a0  
    5353    <para>Prepare E2fsprogs for compilation:</para>
    5454
    55 <screen><userinput remap="configure">../configure --prefix=/usr --with-root-prefix="" \
     55<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true LDFLAGS=-lblkid \
     56    ../configure --prefix=/usr --with-root-prefix="" \
    5657    --enable-elf-shlibs --disable-libblkid --disable-libuuid \
    5758    --disable-uuidd --disable-fsck</userinput></screen>
    … …  
    5960    <variablelist>
    6061      <title>The meaning of the configure options:</title>
     62
     63      <varlistentry>
     64        <term><parameter>PKG_CONFIG...</parameter></term>
     65        <listitem>
     66          <para>This enables E2fsprogs to be built without requiring Pkg-config
     67          to be built and installed first.</para>
     68        </listitem>
     69      </varlistentry>
    6170
    6271      <varlistentry>

  • chapter06/man-db.xml

    r81060b6 r374259a0  
    4444    <para>Prepare Man-DB for compilation:</para>
    4545
    46 <screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib \
     46<screen><userinput remap="configure">libpipeline_CFLAGS='' libpipeline_LIBS='-lpipeline' \
     47    ./configure --prefix=/usr --libexecdir=/usr/lib \
    4748    --docdir=/usr/share/doc/man-db-&man-db-version; --sysconfdir=/etc \
    4849    --disable-setuid --with-browser=/usr/bin/lynx \

  • chapter06/udev.xml

    r81060b6 r374259a0  
    7272    --with-rootlibdir=/lib --libexecdir=/lib/udev \
    7373    --disable-hwdb --disable-introspection \
    74     --disable-keymap</userinput></screen>
     74    --disable-keymap --disable-gudev</userinput></screen>
    7575
    7676    <variablelist>

  • general.ent

    r81060b6 r374259a0  
    1 <!ENTITY version "SVN-20111006">
    2 <!ENTITY releasedate "Oct 6, 2011">
     1<!ENTITY version "SVN-20111007">
     2<!ENTITY releasedate "Oct 7, 2011">
    33<!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
    44<!ENTITY milestone "7.0">

  • packages.ent

    r81060b6 r374259a0  
    195195<!ENTITY gettext-ch6-sbu "5.8 SBU">
    196196
    197 <!ENTITY glib-version "2.28.8">
    198 <!ENTITY glib-size "6,854 KB">
    199 <!ENTITY glib-url "http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-&glib-version;.tar.bz2">
    200 <!ENTITY glib-md5 "789e7520f71c6a4bf08bc683ec764d24">
    201 <!ENTITY glib-home "http://developer.gnome.org/glib/">
    202 <!ENTITY glib-ch6-du "157 MB">
    203 <!ENTITY glib-ch6-sbu "1.3 SBU">
    204 
    205197<!ENTITY glibc-version "2.14">
    206198<!ENTITY glibc-size "15,265 KB">
    … …  
    424416<!ENTITY patch-ch6-sbu "less than 0.1 SBU">
    425417
    426 <!ENTITY pcre-version "8.12">
    427 <!ENTITY pcre-size "969 KB">
    428 <!ENTITY pcre-url "&sourceforge;pcre/pcre-&pcre-version;.tar.bz2">
    429 <!ENTITY pcre-url "">
    430 <!ENTITY pcre-md5 "f14a9fef3c92f3fc6c5ac92d7a2c7eb3">
    431 <!ENTITY pcre-home "http://www.pcre.org/">
    432 <!ENTITY pcre-ch6-du "12 MB">
    433 <!ENTITY pcre-ch6-sbu "0.4 SBU">
    434 
    435418<!ENTITY perl-version "5.14.2">
    436419<!ENTITY perl-size "12,917 KB">
    … …  
    443426<!ENTITY perl-ch6-sbu "7.6 SBU">
    444427
    445 <!ENTITY pkg-config-version "0.26">
    446 <!ENTITY pkg-config-size "387 KB">
    447 <!ENTITY pkg-config-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkg-config-version;.tar.gz">
    448 <!ENTITY pkg-config-md5 "47525c26a9ba7ba14bf85e01509a7234">
    449 <!ENTITY pkg-config-home "http://pkg-config.freedesktop.org/">
    450 <!ENTITY pkg-config-ch5-du " MB">
    451 <!ENTITY pkg-config-ch5-sbu " SBU">
    452 <!ENTITY pkg-config-ch6-du "11.5 MB">
    453 <!ENTITY pkg-config-ch6-sbu "0.3 SBU">
    454 
    455428<!ENTITY procps-version "3.2.8">
    456429<!ENTITY procps-size "279 KB">
Note: See TracChangeset for help on using the changeset viewer.