Author: jim
Date: 2006-07-10 01:45:05 -0600 (Mon, 10 Jul 2006)
New Revision: 1956
Modified:
/
trunk/BOOK/testsuite-tools/common/expect.xml
trunk/BOOK/testsuite-tools/mips/expect.xml
trunk/BOOK/testsuite-tools/mips64/expect-64bit.xml
trunk/BOOK/testsuite-tools/multilib/expect-64bit.xml
Log:
[EMAIL PROTECTED] (orig r2054): jciccone | 2006-07-09 21:53:33 -0700
Added a sed to fix the build of expect primarily on multilib builds because it
was always including $prefix/lib. Now it includes $libdir.
Property changes on:
___________________________________________________________________
Name: svk:merge
- b6734a72-470d-0410-b049-f317dca95413:/:2053
+ b6734a72-470d-0410-b049-f317dca95413:/:2054
Modified: trunk/BOOK/testsuite-tools/common/expect.xml
===================================================================
--- trunk/BOOK/testsuite-tools/common/expect.xml 2006-07-09 19:49:01 UTC
(rev 1955)
+++ trunk/BOOK/testsuite-tools/common/expect.xml 2006-07-10 07:45:05 UTC
(rev 1956)
@@ -25,7 +25,12 @@
<sect2 role="installation">
<title>Installation of Expect</title>
- <para os="a">First, fix a bug that can result in false failures during the
GCC
+ <para os="s1">The following sed prevents searching for libraries in
+ /tools/lib. It will now search in ${libdir}:</para>
+
+<screen os="s2"><userinput>sed -i '/EXP_LIB_SPEC=/[EMAIL PROTECTED]/[EMAIL
PROTECTED]@' configure</userinput></screen>
+
+ <para os="a">Fix a bug that can result in false failures during the GCC
test suite run:</para>
<screen os="b"><userinput>patch -Np1 -i
../&expect-spawn-patch;</userinput></screen>
Modified: trunk/BOOK/testsuite-tools/mips/expect.xml
===================================================================
--- trunk/BOOK/testsuite-tools/mips/expect.xml 2006-07-09 19:49:01 UTC (rev
1955)
+++ trunk/BOOK/testsuite-tools/mips/expect.xml 2006-07-10 07:45:05 UTC (rev
1956)
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/expect.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'s1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/expect.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'s2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/expect.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Modified: trunk/BOOK/testsuite-tools/mips64/expect-64bit.xml
===================================================================
--- trunk/BOOK/testsuite-tools/mips64/expect-64bit.xml 2006-07-09 19:49:01 UTC
(rev 1955)
+++ trunk/BOOK/testsuite-tools/mips64/expect-64bit.xml 2006-07-10 07:45:05 UTC
(rev 1956)
@@ -21,8 +21,16 @@
<sect2 role="installation">
<title>Installation of Expect</title>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/expect.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'s1'])"/>
+
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/expect.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'s2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/expect.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Modified: trunk/BOOK/testsuite-tools/multilib/expect-64bit.xml
===================================================================
--- trunk/BOOK/testsuite-tools/multilib/expect-64bit.xml 2006-07-09
19:49:01 UTC (rev 1955)
+++ trunk/BOOK/testsuite-tools/multilib/expect-64bit.xml 2006-07-10
07:45:05 UTC (rev 1956)
@@ -21,8 +21,16 @@
<sect2 role="installation">
<title>Installation of Expect</title>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/expect.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'s1'])"/>
+
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/expect.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'s2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/expect.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
--
http://linuxfromscratch.org/mailman/listinfo/cross-lfs
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page