aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2012-06-07 20:08:36 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2012-06-07 20:08:36 +0000
commitf76a52e8a08cebcd54c7d5f8de3ce112e43c0fed (patch)
treea80a27691dcd6b881264df1298ee48960c154285
parent57417002ad93d7d5185411d1b192442af6807ce0 (diff)
Remove now unnecessary --disable-perl-regexp from chapter 5's instructions.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9881 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml12
-rw-r--r--chapter05/grep.xml16
-rw-r--r--general.ent4
3 files changed, 15 insertions, 17 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index cc7e21ed6..a52b7148b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,18 @@
-->
<listitem>
+ <para>2012-06-07</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Remove --disable-perl-regexp switch from chapter
+ 5's Grep instruction. It should be unnecessary now as there should
+ be no way for the host's libraries to leak through to the chapter 5
+ toolchain. Thanks to Jeremy Huntwork for the report.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-06-06</para>
<itemizedlist>
<listitem>
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index 2cfe6127e..2be213b6f 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -45,21 +45,7 @@
<para>Prepare Grep for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/tools --disable-perl-regexp</userinput></screen>
-
- <variablelist>
- <title>The meaning of the configure switches:</title>
-
- <varlistentry>
- <term><parameter>--disable-perl-regexp</parameter></term>
- <listitem>
- <para>This ensures that the <command>grep</command> program does
- not get linked against a Perl Compatible Regular Expression (PCRE)
- library that may be present on the host but will not be available
- once we enter the <command>chroot</command> environment.</para>
- </listitem>
- </varlistentry>
- </variablelist>
+<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
<para>Compile the package:</para>
diff --git a/general.ent b/general.ent
index 925cfbba4..1a92b27c7 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120606">
-<!ENTITY releasedate "June 6, 2012">
+<!ENTITY version "SVN-20120607">
+<!ENTITY releasedate "June 7, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->