Changeset 85e109d for general/prog/tcl.xml

Timestamp:

09/14/2014 01:39:38 PM (10 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

547042b2

Parents:

b62ac136

Message:

tcl-8.6.2: fixes for the build instructions.
Add optional instructions for sqlite-tcl to SQLite-3.8.6.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14282 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

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

general/prog/tcl.xml

@@ -124 +124 @@
     </para>
 
-<screen><userinput>cd unix &amp;&amp;
+<screen><userinput>rm -rf pkgs/sqlite3.8.6 &amp;&amp;
+export SRCDIR=`pwd`     &amp;&amp;
+
+cd unix &amp;&amp;
+
 ./configure --prefix=/usr           \
             --without-tzdata        \
@@ -130 +134 @@
             $([ $(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>
+    -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/tdbc1.0.1#/usr/lib/tdbc1.0.0#" \
+    -e "s#$SRCDIR/pkgs/tdbc1.0.1/generic#/usr/include#"    \
+    -e "s#$SRCDIR/pkgs/tdbc1.0.1/library#/usr/lib/tcl8.6#" \
+    -e "s#$SRCDIR/pkgs/tdbc1.0.1#/usr/include#"            \
+    -i pkgs/tdbc1.0.1/tdbcConfig.sh                        &amp;&amp;
+
+sed -e "s#$SRCDIR/unix/pkgs/itcl4.0.1#/usr/lib/itcl4.0.0#" \
+    -e "s#$SRCDIR/pkgs/itcl4.0.1/generic#/usr/include#"    \
+    -e "s#$SRCDIR/pkgs/itcl4.0.1#/usr/include#"            \
+    -i pkgs/itcl4.0.1/itclConfig.sh                        &amp;&amp;
+
+unset SRCDIR</userinput></screen>
+
 
     <para>
@@ -190 +211 @@
 
     <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>rm -rf pkgs/sqlite3.8.6 </command>: <application>SQLite Tcl
+      Extension Architecture (TEA)</application> is removed, because it is
+      optionally installed by <xref linkend="sqlite"/>
+    </para>
+
+    <para>
+      <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 +243 @@
         <seg>
           /usr/lib/itcl4.0.1,
-          /usr/lib/sqlite3.8.6,
           /usr/lib/tcl8,
           /usr/lib/tcl&tcl-ver;,