Changeset e0dfa83

Timestamp:

06/04/2012 01:14:44 AM (12 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

a38269c

Parents:

419252e

Message:

Mirror what LFS is doing for pkg-config and popt.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10258 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• general/genlib/popt.xml (modified) (1 diff)
• general/prog/pkgconfig.xml (modified) (5 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "31">                   <!-- Always 2 digits -->
-<!ENTITY month        "05">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
+<!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 31st, &year;">
+<!ENTITY releasedate  "June 3rd, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -378 +378 @@
 <!ENTITY NASM-version                 "2.09.10">
 <!ENTITY php-version                  "5.3.8">
-<!ENTITY pkgconfig-version            "0.26">
+<!ENTITY pkgconfig-version            "0.26-internal-glib">
 <!ENTITY python2-version              "2.7.3">
 <!ENTITY python3-version              "3.2.2">

general/genlib/popt.xml

@@ -34 +34 @@
     some programs to parse command-line options.</para>
 
-    &lfs70_checked;
+    &lfs71_checked;
+
+    <note><para>Popt is now part of LFS. If you are using a system which includes it,
+    there is nothing more to do. If not (e.g. LFS releases up to and including 7.1),
+    you should follow these instructions.</para></note>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

general/prog/pkgconfig.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY pkgconfig-download-http "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
-  <!ENTITY pkgconfig-download-ftp  "&gentoo-ftp-repo;/pkg-config-&pkgconfig-version;.tar.gz">
-  <!ENTITY pkgconfig-md5sum        "47525c26a9ba7ba14bf85e01509a7234">
-  <!ENTITY pkgconfig-size          "392 KB">
-  <!ENTITY pkgconfig-buildsize     "3 MB">
-  <!ENTITY pkgconfig-time          "less than 0.1 SBU">
+  <!ENTITY pkgconfig-download-http "http://people.freedesktop.org/~dbn/pkg-config-&pkgconfig-version;.tar.gz">
+  <!ENTITY pkgconfig-download-ftp  "">
+  <!ENTITY pkgconfig-md5sum        "015af476352e25409ae562b9d465e500">
+  <!ENTITY pkgconfig-size          "1.9 MB">
+  <!ENTITY pkgconfig-buildsize     "32 MB">
+  <!ENTITY pkgconfig-time          "0.4 SBU">
 ]>
 
@@ -37 +37 @@
     &lfs71_checked;
 
+    <note><para>Pkg-config is part of LFS, but was omitted from the 7.0 and 7.1
+    releases. If you are using a system which includes it, there is nothing more to
+    do. If not, you should follow these instructions.</para></note>
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -62 +66 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="glib2"/></para>
+    <para role="required"><xref linkend="popt"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -72 +76 @@
     <title>Installation of pkg-config</title>
 
-    <para>Fix a problem with one of Pkg-config's tests:</para>
-
-<screen><userinput>sed -i -e '21s/EXPECT_RETURN=1/EXPECT_RETURN=0/' check/check-cmd-options</userinput></screen>
-
     <para>Install <application>pkg-config</application> by running the
     following commands:</para>
 
-<screen><userinput>GLIB_LIBS=-lglib-2.0  GLIB_CFLAGS=-I/usr/include/glib-2.0  \
-./configure --prefix=/usr --docdir=/usr/share/doc/pkg-config-&pkgconfig-version; &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+ --with-installed-popt \
+ --with-internal-glib \
+ --docdir=/usr/share/doc/pkg-config-&pkgconfig-version; &amp;&amp;
 make</userinput></screen>
-
-    <note><para>The make phase is known to fail if the configure option
-    '<option>--with-installed-popt</option>' is used with <xref
-    linkend="popt"/>.</para></note>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -95 +93 @@
   </sect2>
 
-<!--
+
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>- -with-installed-glib</parameter>: This parameter causes
-    the package to use the installed glib2. This is to get rid of the internally used
-    glib-1.</para>
+    <para><parameter>- -with-installed-popt</parameter>: This parameter causes
+    the package to use the installed popt, instead of the broken shipped version.</para>
+
+    <para><parameter>- -with-internal-glib</parameter>: This parameter causes
+    the package to use the shipped version of glib2.</para>
 
   </sect2>
--->
+
   <sect2 role="configuration">
     <title>Configuring pkg-config</title>

introduction/welcome/changelog.xml

@@ -43 +43 @@
 -->
     <listitem>
+      <para>June 3rd, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Mirror what LFS is doing for pkg-config and popt.  Packages
+          listed as needing pkg-config will probably also need glib2, please report
+          any which you find. </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 31st, 2012</para>
       <itemizedlist>