Changeset 1341743


Ignore:
Timestamp:
Jul 29, 2010, 4:51:05 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
3f77b42
Parents:
5359083
Message:

Updated Expect to 5.44.1.15.

Files:
2 added
4 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • BOOK/introduction/common/changelog.xml

    r5359083 r1341743  
    3636    </listitem>
    3737-->
     38
     39    <listitem>
     40      <para>July 29, 2010</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[jciccone] - Updated Expect to 5.44.1.15.</para>
     44        </listitem>
     45      </itemizedlist>
     46    </listitem>
    3847
    3948    <listitem>
  • BOOK/materials/common/patches.xml

    r5359083 r1341743  
    5656
    5757    <varlistentry>
    58       <term>Expect Avoid TCL Internals Patch - <token>&expect-avoid_tcl_internals-patch-size;</token>:</term>
    59       <listitem>
    60         <para>Download: <ulink
    61         url="&patches-root;&expect-avoid_tcl_internals-patch;"/></para>
    62         <para>MD5 sum: <literal>&expect-avoid_tcl_internals-patch-md5;</literal></para>
    63       </listitem>
    64     </varlistentry>
    65 
    66     <varlistentry>
    67       <term>Expect Spawn Patch - <token>&expect-spawn-patch-size;</token>:</term>
    68       <listitem>
    69         <para>Download: <ulink
    70         url="&patches-root;&expect-spawn-patch;"/></para>
    71         <para>MD5 sum: <literal>&expect-spawn-patch-md5;</literal></para>
     58      <term>Expect NoTk Patch - <token>&expect-notk-patch-size;</token>:</term>
     59      <listitem>
     60        <para>Download: <ulink
     61        url="&patches-root;&expect-notk-patch;"/></para>
     62        <para>MD5 sum: <literal>&expect-notk-patch-md5;</literal></para>
    7263      </listitem>
    7364    </varlistentry>
  • BOOK/packages.ent

    r5359083 r1341743  
    136136<!ENTITY elftoaout-home " ">
    137137
    138 <!ENTITY expect-version "5.43.0">
    139 <!ENTITY expect-size "513 KB">
    140 <!ENTITY expect-url "http://expect.nist.gov/src/expect-&expect-version;.tar.gz">
    141 <!ENTITY expect-md5 "43e1dc0e0bc9492cf2e1a6f59f276bc3">
    142 <!ENTITY expect-home "http://expect.nist.gov">
     138<!ENTITY expect-version "5.44.1.15">
     139<!ENTITY expect-size "660 KB">
     140<!ENTITY expect-url "&sourceforge;expect/Expect/&expect-version;/expect-&expect-version;.tar.gz">
     141<!ENTITY expect-md5 "a23a112238ea3d83707e9183c4035d96">
     142<!ENTITY expect-home "http://expect.sourceforge.net">
    143143<!ENTITY expect-lib-version "5.43">
    144144
     
    401401
    402402<!ENTITY tcl-version2 "8.5">
    403 <!ENTITY tcl-version "&tcl-version2;.7">
    404 <!ENTITY tcl-size "4,318 KB">
     403<!ENTITY tcl-version "&tcl-version2;.8">
     404<!ENTITY tcl-size "4,348 KB">
    405405<!ENTITY tcl-url "&sourceforge;tcl/tcl&tcl-version;-src.tar.gz">
    406 <!ENTITY tcl-md5 "f70ad8f78b5e4a9f792fe101f22b125f">
     406<!ENTITY tcl-md5 "7f123e53b3daaaba2478d3af5a0752e3">
    407407<!ENTITY tcl-home "http://www.tcl.tk">
    408408
  • BOOK/patches.ent

    r5359083 r1341743  
    2121<!ENTITY eglibc-fixes-patch-size "2 KB">
    2222
    23 <!ENTITY expect-avoid_tcl_internals-patch "expect-&expect-version;-avoid-tcl-internals-1.patch">
    24 <!ENTITY expect-avoid_tcl_internals-patch-md5 "5661004ca23ddc9592f488142367c2f5">
    25 <!ENTITY expect-avoid_tcl_internals-patch-size "3 KB">
    26 
    27 <!ENTITY expect-spawn-patch "expect-&expect-version;-spawn-2.patch">
    28 <!ENTITY expect-spawn-patch-md5 "7706e1e8238c72eed8dc905d6f3b6aa9">
    29 <!ENTITY expect-spawn-patch-size "6 KB">
     23<!ENTITY expect-notk-patch "expect-&expect-version;-notk-2.patch">
     24<!ENTITY expect-notk-patch-md5 "4fd526f61dfe4a1f01195c02ad114e17">
     25<!ENTITY expect-notk-patch-size "20 KB">
    3026
    3127<!ENTITY flex-gcc44-patch "flex-&flex-version;-gcc44-1.patch">
     
    120116
    121117<!ENTITY expect-config_update-patch "expect-&expect-version;-config_update-1.patch">
    122 <!ENTITY expect-config_update-patch-md5 "eb8989a8baf11e0f02efbdf7e6843fc1">
    123 <!ENTITY expect-config_update-patch-size "51 KB">
     118<!ENTITY expect-config_update-patch-md5 "a508e7661db827551426b74d5a9b57e6">
     119<!ENTITY expect-config_update-patch-size "60 KB">
    124120
    125121<!-- Start of Alpha patches -->
  • BOOK/testsuite-tools/common/expect.xml

    r5359083 r1341743  
    2626    <title>Installation of Expect</title>
    2727
    28     <para os="s1">The following sed tells <command>configure</command> to look
    29     for libraries in ${libdir}, not just in /tools/lib:</para>
     28    <para os="p1">The following patch prevents Expect from detecting Tk and
     29    trying to build expectk:</para>
    3030
    31 <screen os="s2"><userinput>sed -i '/EXP_LIB_SPEC=/s@${exec_prefix}/lib@${libdir}@' configure</userinput></screen>
    32 
    33     <para os="t1">The following sed adds a missing include to
    34     <filename>Dbg.c</filename>:</para>
    35 
    36 <screen os="t2"><userinput>sed -i '1i\#include &lt;expect_cf.h&gt;' Dbg.c</userinput></screen>
    37 
    38     <para os="t3">The following sed causes one of the source files to include
    39     the correct header</para>
    40 
    41 <screen os="t4"><userinput>sed -i "s/tcl.h/tclInt.h/" exp_inter.c</userinput></screen>
    42 
    43     <para os="p1">The following patch prevents Expect from using functions
    44     that are internal to TCL and are no longer available for Expect to
    45     link against:</para>
    46 
    47 <screen os="p2"><userinput>patch -Np1 -i ../&expect-avoid_tcl_internals-patch;</userinput></screen>
    48 
    49     <para os="a">Fix a bug that can result in false failures during the GCC
    50     test suite run:</para>
    51 
    52 <screen os="b"><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen>
     31<screen os="p2"><userinput>patch -Np1 -i ../&expect-notk-patch;</userinput></screen>
    5332
    5433    <para os="c">Now prepare Expect for compilation:</para>
  • BOOK/testsuite-tools/mips/expect.xml

    r5359083 r1341743  
    2828   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="../common/expect.xml"
    30     xpointer="xpointer(//*[@os='s1'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    33     href="../common/expect.xml"
    34     xpointer="xpointer(//*[@os='s2'])"/>
    35 
    36    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../common/expect.xml"
    38     xpointer="xpointer(//*[@os='t1'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="../common/expect.xml"
    42     xpointer="xpointer(//*[@os='t2'])"/>
    43 
    44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    45     href="../common/expect.xml"
    46     xpointer="xpointer(//*[@os='t3'])"/>
    47 
    48     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    49     href="../common/expect.xml"
    50     xpointer="xpointer(//*[@os='t4'])"/>
    51 
    52    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    53     href="../common/expect.xml"
    5430    xpointer="xpointer(//*[@os='p1'])"/>
    5531
     
    5834    xpointer="xpointer(//*[@os='p2'])"/>
    5935
    60    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    61     href="../common/expect.xml"
    62     xpointer="xpointer(//*[@os='a'])"/>
    63 
    64     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    65     href="../common/expect.xml"
    66     xpointer="xpointer(//*[@os='b'])"/>
    67 
    68     <para os="p1">This patch updates <filename>config.guess</filename> and
     36    <para os="mp1">This patch updates <filename>config.guess</filename> and
    6937    <filename>config.sub</filename> for MIPS processors:</para>
    7038
    71 <screen os="p2"><userinput>patch -Np1 -i ../&expect-config_update-patch;</userinput></screen>
     39<screen os="mp2"><userinput>patch -Np1 -i ../&expect-config_update-patch;</userinput></screen>
    7240
    7341    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/testsuite-tools/mips64/expect.xml

    r5359083 r1341743  
    2424   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../common/expect.xml"
    26     xpointer="xpointer(//*[@os='s1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    29     href="../common/expect.xml"
    30     xpointer="xpointer(//*[@os='s2'])"/>
    31 
    32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    33     href="../common/expect.xml"
    34     xpointer="xpointer(//*[@os='t1'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../common/expect.xml"
    38     xpointer="xpointer(//*[@os='t2'])"/>
    39 
    40    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="../common/expect.xml"
    42     xpointer="xpointer(//*[@os='t3'])"/>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    45     href="../common/expect.xml"
    46     xpointer="xpointer(//*[@os='t4'])"/>
    47 
    48    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    49     href="../common/expect.xml"
    5026    xpointer="xpointer(//*[@os='p1'])"/>
    5127
     
    5531
    5632    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    57     href="../common/expect.xml"
    58     xpointer="xpointer(//*[@os='a'])"/>
    59 
    60     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    61     href="../common/expect.xml"
    62     xpointer="xpointer(//*[@os='b'])"/>
     33    href="../mips/expect.xml"
     34    xpointer="xpointer(//*[@os='mp1'])"/>
    6335
    6436    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6537    href="../mips/expect.xml"
    66     xpointer="xpointer(//*[@os='p1'])"/>
    67 
    68     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    69     href="../mips/expect.xml"
    70     xpointer="xpointer(//*[@os='p2'])"/>
     38    xpointer="xpointer(//*[@os='mp2'])"/>
    7139
    7240    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
  • BOOK/testsuite-tools/multilib/expect.xml

    r5359083 r1341743  
    2424   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../common/expect.xml"
    26     xpointer="xpointer(//*[@os='s1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    29     href="../common/expect.xml"
    30     xpointer="xpointer(//*[@os='s2'])"/>
    31 
    32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    33     href="../common/expect.xml"
    34     xpointer="xpointer(//*[@os='t1'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../common/expect.xml"
    38     xpointer="xpointer(//*[@os='t2'])"/>
    39 
    40    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="../common/expect.xml"
    42     xpointer="xpointer(//*[@os='t3'])"/>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    45     href="../common/expect.xml"
    46     xpointer="xpointer(//*[@os='t4'])"/>
    47 
    48    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    49     href="../common/expect.xml"
    5026    xpointer="xpointer(//*[@os='p1'])"/>
    5127
     
    5329    href="../common/expect.xml"
    5430    xpointer="xpointer(//*[@os='p2'])"/>
    55 
    56     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    57     href="../common/expect.xml"
    58     xpointer="xpointer(//*[@os='a'])"/>
    59 
    60     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    61     href="../common/expect.xml"
    62     xpointer="xpointer(//*[@os='b'])"/>
    6331
    6432    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Note: See TracChangeset for help on using the changeset viewer.