aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2011-01-25 20:21:28 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2011-01-25 20:21:28 +0000
commitbae0409e64033c4417871d065bf7eb24ecd5a9de (patch)
tree990eb086f58013effa0d3058dc35b876608bcdc5
parente836f783c29b3c9170d01da6aabc6a434c3b7a57 (diff)
Add a note about optionally building popt before pkg-config
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9451 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml11
-rw-r--r--chapter06/pkg-config.xml6
-rw-r--r--general.ent4
3 files changed, 19 insertions, 2 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index bc6cc0171..29568b18a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,17 @@
-->
<listitem>
+ <para>2011-01-25</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] Add a note about optionally building
+ popt before pkg-config. Fixes
+ <ulink url="&lfs-ticket-root;2821">#2781</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2011-01-24</para>
<itemizedlist>
<listitem>
diff --git a/chapter06/pkg-config.xml b/chapter06/pkg-config.xml
index ceb9581cf..444a30c9a 100644
--- a/chapter06/pkg-config.xml
+++ b/chapter06/pkg-config.xml
@@ -42,6 +42,12 @@
<sect2 role="installation">
<title>Installation of Pkg-config</title>
+ <note><para>Pkg-Config will use an included version of Popt to parse
+ command line options. If an external version of Popt is desired, install
+ that version using the <ulink
+ url="&blfs-root;view/svn/general/popt.html">BLFS Popt build
+ instructions</ulink> before installing Pkg-config.</para></note>
+
<para>Prepare Pkg-config for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/general.ent b/general.ent
index 6ec9cbe4b..6d327df50 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20110124">
-<!ENTITY releasedate "January 24, 2011">
+<!ENTITY version "SVN-20110125">
+<!ENTITY releasedate "January 25, 2011">
<!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "6.8">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->