r1508 - / trunk/BOOK trunk/BOOK/introduction/common trunk/BOOK/temp-system/common trunk/BOOK/temp-system/multilib

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue May 2 08:59:28 PDT 2006


Author: jim
Date: 2006-05-02 09:59:28 -0600 (Tue, 02 May 2006)
New Revision: 1508

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/temp-system/common/bash.xml
   trunk/BOOK/temp-system/multilib/bash.xml
Log:
 r3242 at server (orig r1526):  jim | 2006-05-02 08:57:20 -0700
  r3238 at server:  jim | 2006-05-02 08:53:24 -0700
  Reverted bash change.
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1525
   + b6734a72-470d-0410-b049-f317dca95413:/:1526


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3237
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3238
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-05-02 15:59:17 UTC (rev 1507)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-05-02 15:59:28 UTC (rev 1508)
@@ -42,6 +42,9 @@
         <listitem>
           <para>[jim] - Updated Linux Headers 2.6.16.12 to 05022006.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Reverted change to bash. Needed on some architectures.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/temp-system/common/bash.xml
===================================================================
--- trunk/BOOK/temp-system/common/bash.xml	2006-05-02 15:59:17 UTC (rev 1507)
+++ trunk/BOOK/temp-system/common/bash.xml	2006-05-02 15:59:28 UTC (rev 1508)
@@ -22,12 +22,17 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
+    <para os="c1">Remove a test that causes the build to fail:</para>
+
+<screen os="c2"><userinput>echo "ac_cv_func_setvbuf_reversed=no" >> config.cache</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/bash.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen os="h"><userinput>./configure --prefix=/tools \
-   --without-bash-malloc --host=${LFS_TARGET}</userinput></screen>
+   --without-bash-malloc --host=${LFS_TARGET} \
+   --cache-file=config.cache</userinput></screen>
 
     <variablelist os="ad">
       <title>The meaning of the configure option:</title>

Modified: trunk/BOOK/temp-system/multilib/bash.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/bash.xml	2006-05-02 15:59:17 UTC (rev 1507)
+++ trunk/BOOK/temp-system/multilib/bash.xml	2006-05-02 15:59:28 UTC (rev 1508)
@@ -24,11 +24,20 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='c1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='c2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen os="h"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools \
-   --without-bash-malloc --host=${LFS_TARGET}</userinput></screen>
+   --without-bash-malloc --host=${LFS_TARGET} \
+   --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"




More information about the cross-lfs mailing list