Ignore:
Timestamp:
04/29/2006 02:17:21 PM (18 years ago)
Author:
Randy McMurchy <randy@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, 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, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
38e71da
Parents:
83655c7e
Message:

Updated Tcl and Tk to 8.4.13; Also modified the build commands to not use any user-created environment variables

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • general/prog/tcl.xml

    r83655c7e r36f2c9e  
    77  <!ENTITY tcl-download-http "http://prdownloads.sourceforge.net/tcl/tcl&tcl-version;-src.tar.gz">
    88  <!ENTITY tcl-download-ftp  " ">
    9 <!-- <!ENTITY tcl-download-ftp  "ftp://ftp.us.xemacs.org/pub/tcl/tcl8_4/tcl&tcl-version;-src.tar.gz"> -->
    10   <!ENTITY tcl-md5sum        "7480432d8730263f267952788eb4839b">
     9  <!-- <!ENTITY tcl-download-ftp  "ftp://ftp.us.xemacs.org/pub/tcl/tcl8_4/tcl&tcl-version;-src.tar.gz"> -->
     10  <!ENTITY tcl-md5sum        "c6b655ad5db095ee73227113220c0523">
    1111  <!ENTITY tcl-size          "3.5 MB">
    12   <!ENTITY tcl-buildsize     "24.5 MB">
    13   <!ENTITY tcl-time          "0.3 SBU (additional 0.4 SBU to run the test suite)">
     12  <!ENTITY tcl-buildsize     "24.6 MB">
     13  <!ENTITY tcl-time          "0.3 SBU (additional 0.8 SBU to run the test suite)">
     14  <!-- Ensure this is updated when Tcl moves to the 8.5.x branch -->
     15  <!ENTITY tcl-ver           "8.4">
     16  <!-- Ensure the above is updated when Tcl moves to the 8.5.x branch -->
    1417]>
    1518
    … …  
    7780    commands:</para>
    7881
    79 <screen><userinput>export VERSION=&tcl-version; &amp;&amp;
    80 export V=`echo $VERSION | cut -d "." -f 1,2` &amp;&amp;
    81 export DIR=$PWD &amp;&amp;
    82 cd unix &amp;&amp;
    83 sed -i "s/relid'/relid/" configure &amp;&amp;
     82<screen><userinput>cd unix &amp;&amp;
    8483./configure --prefix=/usr --enable-threads &amp;&amp;
    8584make &amp;&amp;
    86 sed -i -e "s:${DIR}/unix:/usr/lib:" \
    87        -e "s:${DIR}:/usr/include/tcl${V}:" \
    88        -e "s:^TCL_LIB_FILE='libtcl${V}..TCL_DBGX..so':\
    89 TCL_LIB_FILE=\"libtcl${V}\$\{TCL_DBGX\}.so\":" tclConfig.sh</userinput></screen>
     85sed -i -e "s:${PWD}:/usr/lib:" \
     86       -e "s:$(dirname ${PWD}):/usr/include/tcl&tcl-ver;:" \
     87       -e "/TCL_LIB_FILE/ s:':\":g" \
     88    tclConfig.sh</userinput></screen>
    9089
    9190    <para>To test the results, issue: <command>make test</command>.</para>
    … …  
    9392    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
    9493
    95     <caution>
    96       <para>If you become the <systemitem class="username">root</systemitem>
    97       user in a manner that doesn't preserve the unprivileged user's
    98       environment, ensure you correctly set the environment variable
    99       <envar>V</envar> again before running the installation commands.</para>
    100     </caution>
    101 
    10294<screen role="root"><userinput>make install &amp;&amp;
    103 install -v -d /usr/include/tcl${V}/unix &amp;&amp;
    104 install -v -m644 *.h /usr/include/tcl${V}/unix/ &amp;&amp;
    105 install -v -d /usr/include/tcl${V}/generic &amp;&amp;
    106 install -v -c -m644 ../generic/*.h /usr/include/tcl${V}/generic/ &amp;&amp;
    107 rm -v -f /usr/include/tcl${V}/generic/{tcl,tclDecls,tclPlatDecls}.h &amp;&amp;
    108 ln -v -nsf ../../include/tcl${V} /usr/lib/tcl${V}/include &amp;&amp;
    109 ln -v -sf libtcl${V}.so /usr/lib/libtcl.so &amp;&amp;
    110 ln -v -sf tclsh${V} /usr/bin/tclsh</userinput></screen>
    111 
    112     <para>Clean up the unprivileged user's environment using the following
    113     commands:</para>
    114 
    115 <screen><userinput>unset VERSION &amp;&amp;
    116 unset V &amp;&amp;
    117 unset DIR</userinput></screen>
     95install -v -d /usr/include/tcl&tcl-ver;/{unix,generic} &amp;&amp;
     96install -v -m644 *.h /usr/include/tcl&tcl-ver;/unix/ &amp;&amp;
     97install -v -m644 ../generic/*.h /usr/include/tcl&tcl-ver;/generic/ &amp;&amp;
     98rm -v -f /usr/include/tcl&tcl-ver;/generic/tcl{,{,Plat}Decls}.h &amp;&amp;
     99ln -v -nsf ../../include/tcl&tcl-ver; /usr/lib/tcl&tcl-ver;/include &amp;&amp;
     100ln -v -sf libtcl&tcl-ver;.so /usr/lib/libtcl.so &amp;&amp;
     101ln -v -sf tclsh&tcl-ver; /usr/bin/tclsh</userinput></screen>
    118102
    119103  </sect2>
    … …  
    125109    to build with thread support.</para>
    126110
    127     <para><command>sed -i "s/relid'/relid/" configure</command>: This command
    128     fixes a syntax error in the <command>configure</command> script.</para>
    129 
    130111    <para><command>sed -i -e ... tclConfig.sh</command>: The
    131     <application>Tcl</application> package assumes that the source used to build
    132     <application>Tcl</application> is always kept around for compiling packages
    133     that depend on <application>Tcl</application>. This <command>sed</command>
    134     removes the references to the build directory and replaces them with saner
    135     system-wide locations.</para>
     112    <application>Tcl</application> package expects that its source tree is
     113    preserved so that packages depending on it for their compilation
     114    can utilize it. This <command>sed</command> removes the references to the
     115    build directory and replaces them with saner system-wide locations.</para>
    136116
    137117    <para><command>install ...</command>: These commands install the internal
    … …  
    152132
    153133      <seglistitem>
    154         <seg>tclsh and tclsh8.4</seg>
    155         <seg>libtcl.so and libtclstub8.4.a</seg>
    156         <seg>/usr/include/tcl8.4 and /usr/lib/tcl8.4</seg>
     134        <seg>tclsh and tclsh&tcl-ver;</seg>
     135        <seg>libtcl.so and libtclstub&tcl-ver;.a</seg>
     136        <seg>/usr/include/tcl&tcl-ver; and /usr/lib/tcl&tcl-ver;</seg>
    157137      </seglistitem>
    158138    </segmentedlist>
    … …  
    166146        <term><command>tclsh</command></term>
    167147        <listitem>
    168           <para> is a symlink to the <command>tclsh8.4</command>
     148          <para> is a symlink to the <command>tclsh&tcl-ver;</command>
    169149          program.</para>
    170150          <indexterm zone="tcl tclsh">
    … …  
    174154      </varlistentry>
    175155
    176       <varlistentry id="tclsh8.4">
    177         <term><command>tclsh8.4</command></term>
     156      <varlistentry id="tclsh-eight">
     157        <term><command>tclsh&tcl-ver;</command></term>
    178158        <listitem>
    179159          <para> is a simple shell containing the
    180160          <application>Tcl</application> interpreter.</para>
    181           <indexterm zone="tcl tclsh8.4">
    182             <primary sortas="b-tclsh8.4">tclsh8.4</primary>
     161          <indexterm zone="tcl tclsh-eight">
     162            <primary sortas="b-tclsh&tcl-ver;">tclsh&tcl-ver;</primary>
    183163          </indexterm>
    184164        </listitem>
Note: See TracChangeset for help on using the changeset viewer.