Author: ken
Date: 2012-06-03 19:14:44 -0600 (Sun, 03 Jun 2012)
New Revision: 10258
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/genlib/popt.xml
trunk/BOOK/general/prog/pkgconfig.xml
trunk/BOOK/introduction/welcome/changelog.xml
Log:
Mirror what LFS is doing for pkg-config and popt.
Modified: trunk/BOOK/general/genlib/popt.xml
===================================================================
--- trunk/BOOK/general/genlib/popt.xml 2012-06-03 19:46:55 UTC (rev 10257)
+++ trunk/BOOK/general/genlib/popt.xml 2012-06-04 01:14:44 UTC (rev 10258)
@@ -33,8 +33,12 @@
<application>popt</application> libraries which are used by
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>
<itemizedlist spacing="compact">
<listitem>
Modified: trunk/BOOK/general/prog/pkgconfig.xml
===================================================================
--- trunk/BOOK/general/prog/pkgconfig.xml 2012-06-03 19:46:55 UTC (rev
10257)
+++ trunk/BOOK/general/prog/pkgconfig.xml 2012-06-04 01:14:44 UTC (rev
10258)
@@ -4,12 +4,12 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%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">
]>
<sect1 id="pkgconfig" xreflabel="pkg-config-&pkgconfig-version;">
@@ -36,6 +36,10 @@
&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">
<listitem>
@@ -61,7 +65,7 @@
<bridgehead renderas="sect3">Pkg-config Dependencies</bridgehead>
<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:
<ulink url="&blfs-wiki;/pkgconfig"/></para>
@@ -71,21 +75,15 @@
<sect2 role="installation">
<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; &&
+<screen><userinput>./configure --prefix=/usr \
+ --with-installed-popt \
+ --with-internal-glib \
+ --docdir=/usr/share/doc/pkg-config-&pkgconfig-version; &&
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>
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
@@ -94,16 +92,18 @@
</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>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-06-03 19:46:55 UTC (rev 10257)
+++ trunk/BOOK/general.ent 2012-06-04 01:14:44 UTC (rev 10258)
@@ -3,13 +3,13 @@
$Date$
-->
-<!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 -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
@@ -377,7 +377,7 @@
<!ENTITY mercurial-version "2.1.2">
<!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">
<!ENTITY ruby-version "1.9.2-p290">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-06-03 19:46:55 UTC
(rev 10257)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-06-04 01:14:44 UTC
(rev 10258)
@@ -42,6 +42,17 @@
-->
<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>
<listitem>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
