r882 - in trunk/BOOK: introduction/common temp-tools/64 temp-tools/common temp-tools/multilib

ken at linuxfromscratch.org ken at linuxfromscratch.org
Sun Dec 11 06:21:27 PST 2005


Author: ken
Date: 2005-12-11 07:21:27 -0700 (Sun, 11 Dec 2005)
New Revision: 882

Modified:
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/temp-tools/64/tcl.xml
   trunk/BOOK/temp-tools/common/tcl.xml
   trunk/BOOK/temp-tools/multilib/tcl-64bit.xml
Log:
Fix tcl configure with new bash

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2005-12-10 09:34:48 UTC (rev 881)
+++ trunk/BOOK/introduction/common/changelog.xml	2005-12-11 14:21:27 UTC (rev 882)
@@ -37,6 +37,15 @@
 -->
 
     <listitem>
+      <para>December 11, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Fix Tcl configure, thanks to Greg Schafer.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 9, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/temp-tools/64/tcl.xml
===================================================================
--- trunk/BOOK/temp-tools/64/tcl.xml	2005-12-10 09:34:48 UTC (rev 881)
+++ trunk/BOOK/temp-tools/64/tcl.xml	2005-12-11 14:21:27 UTC (rev 882)
@@ -27,10 +27,17 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>cd unix
-CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
+<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"

Modified: trunk/BOOK/temp-tools/common/tcl.xml
===================================================================
--- trunk/BOOK/temp-tools/common/tcl.xml	2005-12-10 09:34:48 UTC (rev 881)
+++ trunk/BOOK/temp-tools/common/tcl.xml	2005-12-11 14:21:27 UTC (rev 882)
@@ -41,10 +41,14 @@
     (they are not mandatory), these packages are required to run the test
     suites in <xref linkend="chapter-building-system"/>.</para>
 
+    <para os="c1">First, fix a syntax error in the configure script.</para>
+
+<screen os="c2"><userinput>cd unix
+sed -i "s/relid'/relid/" configure</userinput></screen>
+
     <para os="b">Prepare Tcl for compilation:</para>
 
-<screen os="c"><userinput>cd unix
-./configure --prefix=/tools</userinput></screen>
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
 
     <para os="d">Build the package:</para>
 

Modified: trunk/BOOK/temp-tools/multilib/tcl-64bit.xml
===================================================================
--- trunk/BOOK/temp-tools/multilib/tcl-64bit.xml	2005-12-10 09:34:48 UTC (rev 881)
+++ trunk/BOOK/temp-tools/multilib/tcl-64bit.xml	2005-12-11 14:21:27 UTC (rev 882)
@@ -25,10 +25,18 @@
     href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c2'])"/>
+
     <para os="m1">We need to change the default lib path to lib64:</para>
 
-<screen os="m2"><userinput>cd unix
-sed -i 's@\$(prefix)/lib@\$(prefix)/lib64 at g' Makefile.in</userinput></screen>
+<screen os="m2"><userinput>sed -i 's@\$(prefix)/lib@\$(prefix)/lib64 at g' Makefile.in
+</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"




More information about the cross-lfs mailing list