Changeset 026bb5d for BOOK/temp-system/common/grep.xml

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Updated simp branch to match main book

File:

• BOOK/temp-system/common/grep.xml (modified) (2 diffs)

BOOK/temp-system/common/grep.xml

@@ -23 +23 @@
     <title>Installation of Grep</title>
 
-    <para os="t1">When Cross Compiling the configure script
-    does not determine the correct values for the following,
-    Set the values manually:</para>
-
-<screen os="t2"><userinput>cat &gt; config.cache &lt;&lt; EOF
-ac_cv_func_malloc_0_nonnull=yes
-ac_cv_func_realloc_0_nonnull=yes
-EOF</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/grep.xml"
@@ -38 +29 @@
 <screen os="ca"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-perl-regexp --without-included-regex \
-    --cache-file=config.cache</userinput></screen>
+    --without-included-regex</userinput></screen>
 
     <variablelist os="cb">
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the new configure option:</title>
 
       <varlistentry>
-        <term><parameter>--disable-perl-regexp</parameter></term>
+        <term><parameter>--without-included-regex</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 when building the final system.</para>
+          <para>When cross-compiling, Grep's <command>configure</command>
+          assumes there is no usable <filename>regex.h</filename> installed and
+          instead uses the one included with Grep. This switch forces the use of
+          the regex functions from EGLIBC.</para>
         </listitem>
       </varlistentry>