Changeset b3dcad4

Timestamp:

Jul 26, 2010, 6:17:00 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

eaafb59

Parents:

ceaa6d5

Message:

Updated Grep to 2.6.3.

Location:

BOOK

Files:

• introduction/common/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• temp-system/common/grep.xml (modified) (2 diffs)
• temp-system/multilib/grep.xml (modified) (1 diff)

BOOK/introduction/common/changelog.xml

@@ -40 +40 @@
       <para>July 26, 2010</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated Grep to 2.6.3.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated Gettext to 0.18.1.1.</para>

BOOK/packages.ent

@@ -186 +186 @@
 <!ENTITY gmp-home "http://gmplib.org/">
 
-<!ENTITY grep-version "2.5.4">
-<!ENTITY grep-size "706 KB">
+<!ENTITY grep-version "2.6.3">
+<!ENTITY grep-size "1,280 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.bz2">
-<!ENTITY grep-md5 "5650ee2ae6ea4b39e9459d7d0585b315">
+<!ENTITY grep-md5 "3095b57837b312f087c0680559de7f13">
 <!ENTITY grep-home "&gnu-software;grep">
 

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/2003/XInclude"
     href="../../final-system/common/grep.xml"
@@ -29 +38 @@
 <screen os="ca"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-perl-regexp --without-included-regex</userinput></screen>
+    --disable-perl-regexp --without-included-regex \
+    --cache-file=config.cache</userinput></screen>
 
     <variablelist os="cb">

BOOK/temp-system/multilib/grep.xml

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='t1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='t2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="ca"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-   --disable-perl-regexp --without-included-regex</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --disable-perl-regexp --without-included-regex \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"