Upgrade to Expect-5.45. Fixes #2791.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9417 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Matthew Burgess 2010-11-18 19:51:44 +00:00
parent a427971654
commit bd488ac24b
7 changed files with 25 additions and 40 deletions

View File

@ -36,6 +36,16 @@
</listitem>
-->
<listitem>
<para>2010-11-18</para>
<itemizedlist>
<listitem>
<para>[matthew] Upgrade to Expect-5.45. Fixes
<ulink url="&lfs-ticket-root;2791">#2791</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2010-11-10</para>
<itemizedlist>

View File

@ -58,9 +58,9 @@
<!--<listitem>
<para>E2fsprogs &e2fsprogs-version;</para>
</listitem>-->
<!--<listitem>
<listitem>
<para>Expect &expect-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>File &file-version;</para>
</listitem>-->
@ -276,6 +276,10 @@
<para>coreutils-8.5-uname-2.patch</para>
</listitem>
<listitem>
<para>expect-5.44.1.15-no_tk-1.patch</para>
</listitem>
<listitem>
<para>perl-5.12.1-libc-1.patch</para>
</listitem>

View File

@ -58,14 +58,6 @@
</listitem>
</varlistentry>
<varlistentry>
<term>Expect Tk Configure Patch - <token>&expect-tk-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&expect-tk-patch;"/></para>
<para>MD5 sum: <literal>&expect-tk-patch-md5;</literal></para>
</listitem>
</varlistentry>
<varlistentry>
<term>Flex GCC-4.4.x Patch - <token>&flex-gcc-patch-size;</token>:</term>
<listitem>

View File

@ -41,13 +41,7 @@
<sect2 role="installation">
<title>Installation of Expect</title>
<para>First, apply a patch to remove the dependency on Tk, that may be
present on the host but will not be available once we enter the
<command>chroot</command> environment:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&expect-tk-patch;</userinput></screen>
<para>Next, force Expect's configure script to use <filename>/bin/stty</filename>
<para>First, force Expect's configure script to use <filename>/bin/stty</filename>
instead of a <filename>/usr/local/bin/stty</filename> it may find on the host system.
This will ensure that our test suite tools remain sane for the final builds of our
toolchain:</para>
@ -58,7 +52,7 @@ sed 's:/usr/local/bin:/bin:' configure.orig &gt; configure</userinput></screen>
<para>Now prepare Expect for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/tools --with-tcl=/tools/lib \
--with-tclinclude=/tools/include --with-tk=no</userinput></screen>
--with-tclinclude=/tools/include</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@ -82,16 +76,6 @@ sed 's:/usr/local/bin:/bin:' configure.orig &gt; configure</userinput></screen>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--with-tk=no</parameter></term>
<listitem>
<para>This tells the configure script not to search for Tk (the
Tcl GUI component) or the X Window System libraries, both of which
may reside on the host system but will not exist in the temporary
environment.</para>
</listitem>
</varlistentry>
</variablelist>
<para>Build the package:</para>

View File

@ -1,5 +1,5 @@
<!ENTITY version "SVN-20101110">
<!ENTITY releasedate "November 10, 2010">
<!ENTITY version "SVN-20101118">
<!ENTITY releasedate "November 18, 2010">
<!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "6.8">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

View File

@ -110,11 +110,11 @@
<!ENTITY e2fsprogs-ch6-du "45 MB">
<!ENTITY e2fsprogs-ch6-sbu "0.5 SBU">
<!ENTITY expect-version "5.44.1.15">
<!ENTITY expect-lib-version "5.44">
<!ENTITY expect-size "534 KB">
<!ENTITY expect-url "&sourceforge;expect/expect-&expect-version;.tar.bz2">
<!ENTITY expect-md5 "9307bbf67e19125036ce34544a78dadf">
<!ENTITY expect-version "5.45">
<!ENTITY expect-lib-version "5.45">
<!ENTITY expect-size "614 KB">
<!ENTITY expect-url "&sourceforge;expect/expect&expect-version;.tar.gz">
<!ENTITY expect-md5 "44e1a4f4c877e9ddc5a542dfa7ecc92b">
<!ENTITY expect-home "http://expect.sourceforge.net/">
<!ENTITY expect-ch5-du "4.1 MB">
<!ENTITY expect-ch5-sbu "0.1 SBU">

View File

@ -30,11 +30,6 @@
<!ENTITY diffutils-i18n-patch-size "18 KB">
<!ENTITY expect-tk-patch "expect-&expect-version;-no_tk-1.patch">
<!ENTITY expect-tk-patch-md5 "ba1b2c5841eea6c62b7522dfde412e65">
<!ENTITY expect-tk-patch-size "4.4 KB">
<!ENTITY flex-gcc-patch "flex-&flex-version;-gcc44-1.patch">
<!ENTITY flex-gcc-patch-md5 "ad9109820534278c6dd0898178c0788f">
<!ENTITY flex-gcc-patch-size "1 KB">