Changeset 229ed25 for BOOK/temp-system/common/grep.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

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>