aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2011-09-04 21:11:07 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2011-09-04 21:11:07 +0000
commitbc3d809946aca8cad9d649f4ee8ef6a41c9dfe31 (patch)
tree7ecf557d2f053678655db45f3a0f631f35880a3b
parenteb797aae86981e4cb0dd0f235cc7230cd85830c2 (diff)
Fix a broken popt function in pkg-config
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9595 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml5
-rw-r--r--chapter06/pkg-config.xml2
2 files changed, 5 insertions, 2 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 086cb928f..24f690e10 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,7 +40,10 @@
<para>2011-09-04</para>
<itemizedlist>
<listitem>
- <para>[bdubbs] - Supress sysvinit overwriting mountpoint from util-linux.
+ <para>[bdubbs] - Fix a broken popt function in pkg-config.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Suppress sysvinit overwriting mountpoint from util-linux.
</para>
</listitem>
</itemizedlist>
diff --git a/chapter06/pkg-config.xml b/chapter06/pkg-config.xml
index 0cb9469ab..c2cf4149f 100644
--- a/chapter06/pkg-config.xml
+++ b/chapter06/pkg-config.xml
@@ -51,7 +51,7 @@
<para>Fix a problem with one of Pkg-config's tests:</para>
-<screen><userinput remap="pre">sed -i -e '21s/EXPECT_RETURN=1/EXPECT_RETURN=0/' check/check-cmd-options</userinput></screen>
+<screen><userinput remap="pre">sed -i -e '/!done/i/ longArg = NULL;' popt/popt.c</userinput></screen>
<para>Prepare Pkg-config for compilation:</para>