Changeset ac38e9dc for general/prog/tcl.xml

Timestamp:

08/01/2015 04:26:22 AM (9 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

systemd-13485

Children:

ad6910d

Parents:

4a83293

Message:

Import back into SVN from Github

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16309 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/prog/tcl.xml (modified) (8 diffs)

general/prog/tcl.xml

@@ -7 +7 @@
   <!ENTITY tcl-download-http "&sourceforge-repo;/tcl/tcl&tcl-version;-src.tar.gz">
   <!ENTITY tcl-download-ftp  " ">
-  <!ENTITY tcl-md5sum        "db382feca91754b7f93da16dc4cdad1f">
+  <!ENTITY tcl-md5sum        "d7cbb91f1ded1919370a30edd1534304">
   <!ENTITY tcl-size          "8.5 MB">
-  <!ENTITY tcl-buildsize     "79 MB (includes documentation installation)">
-  <!ENTITY tcl-time          "1.1 SBU (adittional 1.5 SBU for the tests)">
+  <!ENTITY tcl-buildsize     "69 MB (includes documentation installation, add 10 MB for tests)">
+  <!ENTITY tcl-time          "0.9 SBU (additional 0.5 SBU for the tests)">
 
   <!ENTITY tcl-doc-download  "&sourceforge-repo;/tcl/tcl&tcl-version;-html.tar.gz">
-  <!ENTITY tcl-doc-md5sum    "912142f117a090e83e8ec3d771572191">
+  <!ENTITY tcl-doc-md5sum    "62647d87e9244a4d521c6547e097007c">
   <!ENTITY tcl-doc-size      "1.2 MB">
 
   <!-- Ensure this is updated when Tcl moves from the 8.6.x branch -->
   <!ENTITY tcl-ver           "8.6">
+  <!ENTITY tdbc-ver          "1.0.3">
+  <!ENTITY itcl-ver          "4.0.3">
 ]>
 
@@ -42 +44 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -124 +126 @@
     </para>
 
-<screen><userinput>cd unix &amp;&amp;
+<screen><userinput>export SRCDIR=`pwd` &amp;&amp;
+
+cd unix &amp;&amp;
+
 ./configure --prefix=/usr           \
-            --without-tzdata        \
             --mandir=/usr/share/man \
             $([ $(uname -m) = x86_64 ] &amp;&amp; echo --enable-64bit) &amp;&amp;
 make &amp;&amp;
 
-sed -e "s@^\(TCL_SRC_DIR='\).*@\1/usr/include'@" \
-    -e "/TCL_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \
-    -i tclConfig.sh</userinput></screen>
+sed -e "s#$SRCDIR/unix#/usr/lib#" \
+    -e "s#$SRCDIR#/usr/include#"  \
+    -i tclConfig.sh               &amp;&amp;
+
+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                        &amp;&amp;
+
+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                        &amp;&amp;
+
+unset SRCDIR</userinput></screen>
+
 
     <para>
@@ -145 +163 @@
 <screen role="root"><userinput>make install &amp;&amp;
 make install-private-headers &amp;&amp;
-ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh &amp;&amp;
+ln -sfv tclsh&tcl-ver; /usr/bin/tclsh &amp;&amp;
 chmod -v 755 /usr/lib/libtcl&tcl-ver;.so</userinput></screen>
 
@@ -161 +179 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <option>--without-tzdata</option>: This switch prevents installation
-      of the shipped timezone data which are older than the ones provided
-      in LFS.
-    </para>
 
     <para>
@@ -190 +202 @@
 
     <para>
-      <command>sed -e ... tclConfig.sh</command>: The
-      <application>Tcl</application> package expects that its source tree is
-      preserved so that packages depending on it for their compilation
-      can utilize it. This <command>sed</command> removes the references to the
-      build directory and replaces them with saner system-wide locations.
+      <command>sed -e ...</command>: The <application>Tcl</application> package
+      expects that its source tree is preserved so that packages depending on
+      it for their compilation can utilize it. These <command>sed</command>
+      remove the references to the build directory and replace them with saner
+      system-wide locations.
     </para>
 
@@ -216 +228 @@
         <seg>
           /usr/lib/itcl4.0.1,
-          /usr/lib/sqlite3.8.6,
+          /usr/lib/sqlite3.8.6
           /usr/lib/tcl8,
           /usr/lib/tcl&tcl-ver;,
@@ -224 +236 @@
           /usr/lib/tdbcpostgres1.0.1,
           /usr/lib/thread2.7.1,
-          /usr/share/doc/&tcl-version;, and
+          /usr/share/doc/tcl-&tcl-version;, and
           /usr/share/man/mann
         </seg>