aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2010-03-27 10:31:55 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2010-03-27 10:31:55 +0000
commit7a95c735c8e3bcd673a55b7268e78e5eb1a07a8e (patch)
treec5a65fb2daafd5bb127513abad3101eca32ef2aa /chapter06
parenta68d8700259094c0cfa465c4525aaebbb926d1b2 (diff)
Upgrade to Grep-2.6.1. Fixes #2617.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9237 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/grep.xml32
1 files changed, 2 insertions, 30 deletions
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index d4e17ba5d..760b5b1d8 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -40,32 +40,10 @@
<sect2 role="installation">
<title>Installation of Grep</title>
- <para>The current Grep package has many bugs, especially in the support of
- multibyte locales. The following consolidated patch from Debian fixes some of them,
- improves the number of individual tests which are passed, and much improves the
- speed in UTF-8 locales:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&grep-debian-patch;</userinput></screen>
-
<para>Prepare Grep for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
- --bindir=/bin \
- --without-included-regex</userinput></screen>
-
-
- <variablelist>
- <title>The meaning of the configure switch:</title>
- <varlistentry>
- <term><parameter>--without-included-regex</parameter></term>
- <listitem>
- <para>The configure check for Glibc's regex library is broken when
- building against Glibc-&glibc-version;. This switch forces the use
- of Glibc's regex library.</para>
- </listitem>
- </varlistentry>
- </variablelist>
-
+ --bindir=/bin</userinput></screen>
<para>Compile the package:</para>
@@ -73,13 +51,7 @@
<para>To test the results, issue:</para>
-<screen><userinput remap="test">make check || true</userinput></screen>
-
- <para>There are known test failures in the <command>fmbtest.sh</command>
- tests. The &quot;|| true&quot; construct is
- used to avoid automated build scripts failing due to the test failures.
- A good run will show 1 failure from 14 tests, although the test failure
- will detail 2 failed sub-tests.</para>
+<screen><userinput remap="test">make check</userinput></screen>
<para>Install the package:</para>