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

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Nov 14 15:26:52 PST 2005


Author: jim
Date: 2005-11-14 16:26:47 -0700 (Mon, 14 Nov 2005)
New Revision: 706

Modified:
   trunk/BOOK/
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/temp-tools/64/expect-64bit.xml
   trunk/BOOK/temp-tools/64/tcl-64bit.xml
   trunk/BOOK/temp-tools/common/expect.xml
   trunk/BOOK/temp-tools/common/tcl.xml
   trunk/BOOK/temp-tools/multilib/expect-64bit.xml
   trunk/BOOK/temp-tools/multilib/tcl-64bit.xml
Log:
 r770 at server:  jim | 2005-11-14 15:25:06 -0800
 Updates to TCL/Expect use install-private-headers. Thank you Greg Schafer



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:750
   + f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:770

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2005-11-14 20:22:06 UTC (rev 705)
+++ trunk/BOOK/introduction/common/changelog.xml	2005-11-14 23:26:47 UTC (rev 706)
@@ -48,6 +48,12 @@
           <para>[manuel] - Omit running Bzip2's testsuite as a separate step,
           as make runs it automatically. Ported from LFS-SVN.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Updated TCL build to install headers. Thank you Greg Schafer.</para>
+        </listitem>
+        <listitem>
+          <para>[jim] - Updated Expect to use the newly relocated TCL Headers. Thank you Greg Schafer.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/temp-tools/64/expect-64bit.xml
===================================================================
--- trunk/BOOK/temp-tools/64/expect-64bit.xml	2005-11-14 20:22:06 UTC (rev 705)
+++ trunk/BOOK/temp-tools/64/expect-64bit.xml	2005-11-14 23:26:47 UTC (rev 706)
@@ -34,7 +34,7 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
-   --with-tclinclude=$TCLPATH --with-x=no</userinput></screen>
+   --with-tclinclude=/tools/include --with-x=no</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/expect.xml"
@@ -64,18 +64,6 @@
     href="../common/expect.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-tools/64/tcl-64bit.xml
===================================================================
--- trunk/BOOK/temp-tools/64/tcl-64bit.xml	2005-11-14 20:22:06 UTC (rev 705)
+++ trunk/BOOK/temp-tools/64/tcl-64bit.xml	2005-11-14 23:26:47 UTC (rev 706)
@@ -54,10 +54,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-tools/common/expect.xml
===================================================================
--- trunk/BOOK/temp-tools/common/expect.xml	2005-11-14 20:22:06 UTC (rev 705)
+++ trunk/BOOK/temp-tools/common/expect.xml	2005-11-14 23:26:47 UTC (rev 706)
@@ -42,7 +42,7 @@
     <para os="c">Now prepare Expect for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
-   --with-tclinclude=$TCLPATH --with-x=no</userinput></screen>
+   --with-tclinclude=/tools/include --with-x=no</userinput></screen>
 
     <variablelist os="d">
       <title>The meaning of the configure options:</title>
@@ -56,10 +56,10 @@
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--with-tclinclude=$TCLPATH</parameter></term>
+        <term><parameter>--with-tclinclude=/tools/include</parameter></term>
         <listitem>
-          <para>This explicitly tells Expect where to find Tcl's source
-          directory and internal headers. Using this option avoids conditions
+          <para>This explicitly tells Expect where to find Tcl's internal headers.
+           Using this option avoids conditions
           where <command>configure</command> fails because it cannot
           automatically discover the location of the Tcl source directory.</para>
         </listitem>
@@ -104,13 +104,6 @@
 
     </variablelist>
 
-    <para os="k">Now remove the <envar>TCLPATH</envar> variable:</para>
-
-<screen os="l"><userinput>unset TCLPATH</userinput></screen>
-
-    <para os="m">The source directories of both Tcl and Expect can now
-    be removed.</para>
-
   </sect2>
 
   <sect2 id="contents-expect" role="content">

Modified: trunk/BOOK/temp-tools/common/tcl.xml
===================================================================
--- trunk/BOOK/temp-tools/common/tcl.xml	2005-11-14 20:22:06 UTC (rev 705)
+++ trunk/BOOK/temp-tools/common/tcl.xml	2005-11-14 23:26:47 UTC (rev 706)
@@ -65,18 +65,10 @@
 
 <screen os="g"><userinput>make install</userinput></screen>
 
-    <warning os="h">
-      <para><emphasis>Do not</emphasis> remove the <filename
-      class="directory">tcl&tcl-version;</filename> source directory yet,
-      as the next package will need its internal headers.</para>
-    </warning>
+    <para os="i">Now we will install the TCL headers into /tools.</para>
 
-    <para os="i">Set a variable containing the full path of the current directory.
-    The next package, Expect, will use this variable to find Tcl's headers.</para>
+<screen os="j"><userinput>make install-private-headers</userinput></screen>
 
-<screen os="j"><userinput>cd ..
-export TCLPATH=`pwd`</userinput></screen>
-
     <para os="k">Now make a necessary symbolic link:</para>
 
 <screen os="l"><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>

Modified: trunk/BOOK/temp-tools/multilib/expect-64bit.xml
===================================================================
--- trunk/BOOK/temp-tools/multilib/expect-64bit.xml	2005-11-14 20:22:06 UTC (rev 705)
+++ trunk/BOOK/temp-tools/multilib/expect-64bit.xml	2005-11-14 23:26:47 UTC (rev 706)
@@ -34,7 +34,7 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
-   --with-tcl=/tools/lib64 --with-tclinclude=$TCLPATH \
+   --with-tcl=/tools/lib64 --with-tclinclude=/tools/include  \
    --libdir=/tools/lib64 --with-x=no</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -65,18 +65,6 @@
     href="../common/expect.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-tools/multilib/tcl-64bit.xml
===================================================================
--- trunk/BOOK/temp-tools/multilib/tcl-64bit.xml	2005-11-14 20:22:06 UTC (rev 705)
+++ trunk/BOOK/temp-tools/multilib/tcl-64bit.xml	2005-11-14 23:26:47 UTC (rev 706)
@@ -55,10 +55,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"




More information about the cross-lfs mailing list