Changeset 36f2c9e


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

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r83655c7e r36f2c9e  
    184184<!ENTITY pyxml-version                "0.8.4">
    185185<!ENTITY ruby-version                 "1.8.4">
    186 <!ENTITY tcl-version                  "8.4.12">
    187 <!ENTITY tk-version                   "8.4.12">
     186<!ENTITY tcl-version                  "8.4.13">
     187<!ENTITY tk-version                   "8.4.13">
    188188
    189189<!-- Perl module versions used in the Perl Modules instructions -->

  • 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>

  • general/prog/tk.xml

    r83655c7e r36f2c9e  
    55  %general-entities;
    66
    7     <!-- Inserted as a reminder to do this. The mention of a test suite
    8          is usually right before the root user installation commands. Please
    9          delete these 12 (including one blank) lines after you are done.-->
    10 
    11     <!-- Use one of the two mentions below about a test suite,
    12          delete the line that is not applicable. Of course, if the
    13          test suite uses syntax other than "make check", revise the
    14          line to reflect the actual syntax to run the test suite -->
    15 
    16     <!-- <para>This package does not come with a test suite.</para> -->
    17     <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
    18 
    197  <!ENTITY tk-download-http "http://prdownloads.sourceforge.net/tcl/tk&tk-version;-src.tar.gz">
    208  <!ENTITY tk-download-ftp  " ">
    219<!--  <!ENTITY tk-download-ftp  "ftp://ftp.us.xemacs.org/pub/tcl/tcl8_4/tk&tk-version;-src.tar.gz"> -->
    22   <!ENTITY tk-md5sum        "316491cb82d898b434842353aed1f0d6">
     10  <!ENTITY tk-md5sum        "0a16d4d9398e43cbb85784c85fb807a4">
    2311  <!ENTITY tk-size          "3.2 MB">
    24   <!ENTITY tk-buildsize     "23.5 MB">
     12  <!ENTITY tk-buildsize     "23.3 MB">
    2513  <!ENTITY tk-time          "0.4 SBU">
     14  <!-- Ensure this is updated when Tk moves to the 8.5.x branch -->
     15  <!ENTITY tk-ver           "8.4">
     16  <!-- Ensure the above is updated when Tk moves to the 8.5.x branch -->
    2617]>
    2718
    … …  
    8980commands:</para>
    9081
    91 <screen><userinput>export VERSION=&tk-version; &amp;&amp;
    92 export V=`echo $VERSION | cut -d "." -f 1,2` &amp;&amp;
    93 export DIR=$PWD &amp;&amp;
    94 cd unix &amp;&amp;
    95 sed -i "s/relid'/relid/" configure &amp;&amp;
     82<screen><userinput>cd unix &amp;&amp;
    9683./configure --prefix=/usr --enable-threads &amp;&amp;
    9784make &amp;&amp;
    98 sed -i -e "s:${DIR}/unix:/usr/lib:" \
    99        -e "s:${DIR}:/usr/include/tk${V}:" tkConfig.sh</userinput></screen>
     85sed -i -e "s:${PWD}:/usr/lib:" \
     86       -e "s:$(dirname ${PWD}):/usr/include/tk&tk-ver;:" \
     87    tkConfig.sh</userinput></screen>
    10088
    101     <para>The test is not recommended.  Some tests may crash your X Server.  To
    102     test the results, issue: <command>make test</command>.  Ensure you run it
    103     from an X Window display device with the GLX extensions loaded, else the
    104     tests will hang.</para>
     89    <para>Running the tests is not recommended. Some tests may crash your X
     90    Server. To test the results anyway, issue: <command>make test</command>.
     91    Ensure you run it from an X Window display device with the GLX extensions
     92    loaded, else the tests will hang.</para>
    10593
    10694    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
    10795
    108     <caution>
    109       <para>If you become the <systemitem class="username">root</systemitem>
    110       user in a manner that doesn't preserve the unprivileged user's
    111       environment, ensure you correctly set the environment variable
    112       <envar>V</envar> again before running the installation commands.</para>
    113     </caution>
    114 
    11596<screen role="root"><userinput>make install &amp;&amp;
    116 install -v -d /usr/include/tk${V}/unix &amp;&amp;
    117 install -v -m644 *.h /usr/include/tk${V}/unix/ &amp;&amp;
    118 install -v -d /usr/include/tk${V}/generic &amp;&amp;
    119 install -v -m644 ../generic/*.h /usr/include/tk${V}/generic/ &amp;&amp;
    120 rm -v -f /usr/include/tk${V}/generic/{tk,tkDecls,tkPlatDecls}.h &amp;&amp;
    121 ln -v -nsf ../../include/tk${V} /usr/lib/tk${V}/include &amp;&amp;
    122 ln -v -sf libtk${V}.so /usr/lib/libtk.so &amp;&amp;
    123 ln -v -sf wish${V} /usr/bin/wish</userinput></screen>
    124 
    125     <para>Clean up the unprivileged user's environment using the following
    126     commands:</para>
    127 
    128 <screen><userinput>unset VERSION &amp;&amp;
    129 unset V &amp;&amp;
    130 unset DIR</userinput></screen>
     97install -v -m755 -d /usr/include/tk&tk-ver;/{unix,generic} &amp;&amp;
     98install -v -m644 *.h /usr/include/tk&tk-ver;/unix/ &amp;&amp;
     99install -v -m644 ../generic/*.h /usr/include/tk&tk-ver;/generic/ &amp;&amp;
     100rm -v -f /usr/include/tk&tk-ver;/generic/tk{,{,Plat}Decls}.h &amp;&amp;
     101ln -v -nsf ../../include/tk&tk-ver; /usr/lib/tk&tk-ver;/include &amp;&amp;
     102ln -v -sf libtk&tk-ver;.so /usr/lib/libtk.so &amp;&amp;
     103ln -v -sf wish&tk-ver; /usr/bin/wish</userinput></screen>
    131104
    132105  </sect2>
    … …  
    135108    <title>Command Explanations</title>
    136109
    137     <para><parameter>--enable-threads</parameter>: This switch forces the package
    138     to build with thread support.</para>
    139 
    140     <para><command>sed -i "s/relid'/relid/" configure</command>: This command
    141     fixes a syntax error in the <command>configure</command> script.</para>
     110    <para><parameter>--enable-threads</parameter>: This switch forces the
     111    package to build with thread support.</para>
    142112
    143113    <para><command>sed -i -e ... tkConfig.sh</command>: The
    144     <application>Tk</application> package assumes that the source used to build
    145     <application>Tk</application> is always kept around for compiling packages
    146     that depend on <application>Tk</application>. This <command>sed</command>
    147     removes the references to the build directory and replaces them with saner
    148     system-wide locations.</para>
     114    <application>Tk</application> package expects that its source tree is
     115    preserved so that packages depending on it for their compilation
     116    can utilize it. This <command>sed</command> removes the references to the
     117    build directory and replaces them with saner system-wide locations.</para>
    149118
    150119    <para><command>install ...</command>: These commands install the internal
    … …  
    165134
    166135      <seglistitem>
    167         <seg>wish and wish8.4</seg>
    168         <seg>libtk.so and libtkstub8.4.a</seg>
    169         <seg>/usr/include/tk8.4 and /usr/lib/tk8.4</seg>
     136        <seg>wish and wish&tk-ver;</seg>
     137        <seg>libtk.so and libtkstub&tk-ver;.a</seg>
     138        <seg>/usr/include/tk&tk-ver; and /usr/lib/tk&tk-ver;</seg>
    170139      </seglistitem>
    171140    </segmentedlist>
    … …  
    179148        <term><command>wish</command></term>
    180149        <listitem>
    181           <para> is a symlink to the <command>wish8.4</command> program.</para>
     150          <para> is a symlink to the <command>wish&tk-ver;</command>
     151          program.</para>
    182152          <indexterm zone="tk wish">
    183153            <primary sortas="g-wish">wish</primary>
    … …  
    186156      </varlistentry>
    187157
    188       <varlistentry id="wish8.4">
    189         <term><command>wish8.4</command></term>
     158      <varlistentry id="wish-eight">
     159        <term><command>wish&tk-ver;</command></term>
    190160        <listitem>
    191161          <para> is a simple shell containing the
    192162          <application>Tk</application> toolkit that creates a main window and
    193163          then processes <application>Tcl</application> commands.</para>
    194           <indexterm zone="tk wish8.4">
    195             <primary sortas="b-wish8.4">wish8.4</primary>
     164          <indexterm zone="tk wish-eight">
     165            <primary sortas="b-wish&tk-ver;">wish&tk-ver;</primary>
    196166          </indexterm>
    197167        </listitem>

  • introduction/welcome/changelog.xml

    r83655c7e r36f2c9e  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[randy] - Updated Tcl and Tk to 8.4.13. Also modified the build
     49          commands to not use any user-created environment variables.</para>
     50        </listitem>
     51        <listitem>
    4852          <para>[bdubbs] - Changed openssh libexecdir to /usr/lib/openssh.</para>
    4953        </listitem>
Note: See TracChangeset for help on using the changeset viewer.