Changeset 28e610db

Timestamp:

06/22/2020 11:11:08 PM (4 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

380fdc0

Parents:

bfab1b2

Message:

Move tcl, expect, and dejagnu to Chapter 8

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11981 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter03/packages.xml (modified) (1 diff)
• chapter07/chapter07.xml (modified) (1 diff)
• chapter08/chapter08.xml (modified) (1 diff)
• chapter08/dejagnu.xml (moved) (moved from chapter07/dejagnu.xml )
• chapter08/expect.xml (moved) (moved from chapter07/expect.xml ) (1 diff)
• chapter08/tcl.xml (moved) (moved from chapter07/tcl.xml ) (2 diffs)
• packages.ent (modified) (1 diff)

chapter03/packages.xml

@@ -691 +691 @@
         <para>Download: <ulink url="&tcl-url;"/></para>
         <para>MD5 sum: <literal>&tcl-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Tcl Documentation (&tcl-version;) - <token>&tcl-docs-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&tcl-docs-url;"/></para>
+        <para>MD5 sum: <literal>&tcl-docs-md5;</literal></para>
       </listitem>
     </varlistentry>

chapter07/chapter07.xml

@@ -25 +25 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
+  
+<!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
+-->
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stripping.xml"/>
 

chapter08/chapter08.xml

@@ -15 +15 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgmgt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-pages.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibc.xml"/>

chapter08/expect.xml

@@ -83 +83 @@
 <screen><userinput remap="make">make</userinput></screen>
 
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make test</userinput></screen>
+
     <para>Install the package:</para>
 

chapter08/tcl.xml

@@ -50 +50 @@
     excessive, but it is very reassuring, if not essential, to know that the
     most important tools are working properly. 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
+    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>
@@ -106 +110 @@
     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>

packages.ent

@@ -679 +679 @@
 <!ENTITY tcl-md5 "97c55573f8520bcab74e21bfd8d0aadc">
 <!ENTITY tcl-home "http://tcl.sourceforge.net/">
+<!ENTITY tcl-docs-url "https://downloads.sourceforge.net/tcl/tcl&tcl-version;-html.tar.gz">
+<!ENTITY tcl-docs-md5 "a012711241ba3a5bd4a04e833001d489">
+<!ENTITY tcl-docs-size "1,171 KB">
 <!ENTITY tcl-tmp-du "76 MB">
 <!ENTITY tcl-tmp-sbu "0.9 SBU">