Changeset 37e35d2 for chapter08/tcl.xml

Timestamp:

06/29/2020 07:55:01 AM (4 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib-10.1

Children:

c4804e8

Parents:

d4fdde6

Message:

Update to new lfs structure

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11986 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter08/tcl.xml (moved) (moved from chapter05/tcl.xml ) (6 diffs)

chapter08/tcl.xml

@@ -4 +4 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
+  <!ENTITY tdbc-ver          "1.1.1">
+  <!ENTITY itcl-ver          "4.2.0">
 ]>
 
@@ -33 +35 @@
 
       <seglistitem>
-        <seg>&tcl-ch5-sbu;</seg>
-        <seg>&tcl-ch5-du;</seg>
+        <seg>&tcl-tmp-sbu;</seg>
+        <seg>&tcl-tmp-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -44 +46 @@
 
     <para>This package and the next two (Expect and DejaGNU) are
-    installed to support running the test suites for GCC and Binutils and other
+    installed to support running the test suites for GCC and binutils and other
     packages.  Installing three packages for testing purposes may seem
     excessive, but it is very reassuring, if not essential, to know that the
-    most important tools are working properly. Even if the test suites are not
-    run in this chapter (they are not mandatory), these packages are required
-    to run the test suites in <xref linkend="chapter-building-system"/>.</para>
-
-    <para>Note that the Tcl package used here is a minimal version needed
+    most important tools are working properly. These packages are required
+    to run the test suites in this chapter.</para>
+
+<!--    <para>Note that the Tcl package used here is a minimal version needed
     to run the LFS tests.  For the full package, see the  
-    <ulink url='&blfs-book;general/tcl.html'>BLFS Tcl procedures</ulink>.</para>
+    <ulink url='&blfs-book;general/tcl.html'>BLFS Tcl procedures</ulink>.</para>-->
+
+    <para>First, unpack the documentation by issuing the following command:</para>
+
+<screen><userinput remap="pre">tar -xf ../tcl8.6.10-html.tar.gz --strip-components=1</userinput></screen>
 
     <para>Prepare Tcl for compilation:</para>
 
-<screen><userinput remap="configure">cd unix
-./configure --prefix=/tools</userinput></screen>
+<screen><userinput remap="configure">SRCDIR=$(pwd)
+cd unix
+./configure --prefix=/usr           \
+            --mandir=/usr/share/man \
+            $([ "$(uname -m)" = x86_64 ] &amp;&amp; echo --enable-64bit)</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <term><parameter>$([ "$(uname -m)" = x86_64 ] &amp;&amp; echo --enable-64bit)</parameter></term>
+        <listitem>
+          <para>The construct <parameter>$(&lt;shell command&gt;)</parameter>
+          is replaced by the output of the shell command.  Here this output is
+          empty if running on a 32 bit machine, and is
+          <parameter>--enable-64bit</parameter> if running on a 64 bit machine.
+          </para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
     <para>Build the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>Compilation is now complete. As discussed earlier, running the test
-    suite is not mandatory for the temporary tools here in this chapter. To run
-    the Tcl test suite anyway, issue the following command:</para>
-
-<screen><userinput remap="test">TZ=UTC make test</userinput></screen>
-
-    <para>The Tcl test suite may experience failures under certain host
-    conditions that are not fully understood. Therefore, test suite failures
-    here are not surprising, and are not considered critical. The
-    <parameter>TZ=UTC</parameter> parameter sets the time zone to Coordinated
-    Universal Time (UTC), but only
-    for the duration of the test suite run. This ensures that the clock tests
-    are exercised correctly. Details on the <envar>TZ</envar> environment
-    variable are provided in <xref linkend="chapter-config"/>.</para>
+<screen><userinput remap="make">make
+
+sed -e "s|$SRCDIR/unix|/usr/lib|" \
+    -e "s|$SRCDIR|/usr/include|"  \
+    -i tclConfig.sh
+
+sed -e "s|$SRCDIR/unix/pkgs/tdbc&tdbc-ver;|/usr/lib/tdbc&tdbc-ver;|" \
+    -e "s|$SRCDIR/pkgs/tdbc&tdbc-ver;/generic|/usr/include|"    \
+    -e "s|$SRCDIR/pkgs/tdbc&tdbc-ver;/library|/usr/lib/tcl8.6|" \
+    -e "s|$SRCDIR/pkgs/tdbc&tdbc-ver;|/usr/include|"            \
+    -i pkgs/tdbc&tdbc-ver;/tdbcConfig.sh
+
+sed -e "s|$SRCDIR/unix/pkgs/itcl&itcl-ver;|/usr/lib/itcl&itcl-ver;|" \
+    -e "s|$SRCDIR/pkgs/itcl&itcl-ver;/generic|/usr/include|"    \
+    -e "s|$SRCDIR/pkgs/itcl&itcl-ver;|/usr/include|"            \
+    -i pkgs/itcl&itcl-ver;/itclConfig.sh
+
+unset SRCDIR</userinput></screen>
+
+    <para>The various <quote>sed</quote> instructions after the
+    <quote>make</quote> command removes references to the build directory from
+    the configuration files and replaces them with the install directory.
+    This is not mandatory for the remainder of LFS, but may be needed in case a
+    package built later uses Tcl.</para>
+
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make test</userinput></screen>
 
     <para>Install the package:</para>
@@ -86 +122 @@
     be removed later:</para>
 
-<screen><userinput remap="install">chmod -v u+w /tools/lib/libtcl&tcl-major-version;.so</userinput></screen>
-
-    <para>Install Tcl's headers. The next package, Expect, requires them
-    to build.</para>
+<screen><userinput remap="install">chmod -v u+w /usr/lib/libtcl&tcl-major-version;.so</userinput></screen>
+
+    <para>Install Tcl's headers. The next package, Expect, requires them.</para>
 
 <screen><userinput remap="install">make install-private-headers</userinput></screen>
@@ -95 +130 @@
     <para>Now make a necessary symbolic link:</para>
 
-<screen><userinput remap="install">ln -sv tclsh&tcl-major-version; /tools/bin/tclsh</userinput></screen>
+<screen><userinput remap="install">ln -sfv tclsh&tcl-major-version; /usr/bin/tclsh</userinput></screen>
 
   </sect2>
@@ -107 +142 @@
 
       <seglistitem>
-        <seg>tclsh (link to tclsh&tcl-major-version;) and tclsh&tcl-major-version;</seg>
-        <seg>libtcl&tcl-major-version;.so, libtclstub&tcl-major-version;.a</seg>
+        <seg>
+          tclsh (link to tclsh&tcl-major-version;) and 
+          tclsh&tcl-major-version;
+        </seg>
+        <seg>
+          libtcl&tcl-major-version;.so and 
+          libtclstub&tcl-major-version;.a
+        </seg>
       </seglistitem>
     </segmentedlist>