diff options
| author | Matthew Burgess <matthew@linuxfromscratch.org> | 2010-06-21 14:54:20 +0000 |
|---|---|---|
| committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2010-06-21 14:54:20 +0000 |
| commit | b02111550a5ddeb495e99786910223010869e8b4 (patch) | |
| tree | 22fd172917b1df4e7d2dcbceacba7ca8146c5239 /chapter05/expect.xml | |
| parent | eaccb06117dd774fadb9914e2dcb783707449375 (diff) | |
Upgrade to Expect-5.44.1.15. Fixes #2689.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9305 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05/expect.xml')
| -rw-r--r-- | chapter05/expect.xml | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chapter05/expect.xml b/chapter05/expect.xml index 5e54450fc..db7857acc 100644 --- a/chapter05/expect.xml +++ b/chapter05/expect.xml @@ -41,14 +41,11 @@ <sect2 role="installation"> <title>Installation of Expect</title> - <para>First, fix a bug that can result in false failures during the GCC test - suite run:</para> + <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-spawn-patch;</userinput></screen> - - <para>Next, fix a bug that is a result of recent Tcl changes:</para> - -<screen><userinput remap="pre">patch -Np1 -i ../&expect-tcl-patch;</userinput></screen> +<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> instead of a <filename>/usr/local/bin/stty</filename> it may find on the host system. @@ -61,7 +58,7 @@ sed 's:/usr/local/bin:/bin:' configure.orig > 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-x=no</userinput></screen> + --with-tclinclude=/tools/include --with-tk=no</userinput></screen> <variablelist> <title>The meaning of the configure options:</title> @@ -86,7 +83,7 @@ sed 's:/usr/local/bin:/bin:' configure.orig > configure</userinput></screen> </varlistentry> <varlistentry> - <term><parameter>--with-x=no</parameter></term> + <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 |