Changeset a3b04fe for BOOK/testsuite-tools

Timestamp:

Jul 9, 2006, 9:53:33 PM (18 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:

6fa2db2

Parents:

a8355dc

Message:

Added a sed to fix the build of expect primarily on multilib builds because it was always including $prefix/lib. Now it includes $libdir.

Location:

BOOK/testsuite-tools

Files:

• common/expect.xml (modified) (1 diff)
• mips/expect.xml (modified) (1 diff)
• mips64/expect-64bit.xml (modified) (1 diff)
• multilib/expect-64bit.xml (modified) (1 diff)

BOOK/testsuite-tools/common/expect.xml

@@ -26 +26 @@
     <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=/s@${exec_prefix}/lib@${libdir}@' configure</userinput></screen>
+
+    <para os="a">Fix a bug that can result in false failures during the GCC
     test suite run:</para>
 

BOOK/testsuite-tools/mips/expect.xml

@@ -25 +25 @@
   <sect2 role="installation">
     <title>Installation of Expect</title>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/testsuite-tools/mips64/expect-64bit.xml

@@ -21 +21 @@
   <sect2 role="installation">
     <title>Installation of Expect</title>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/testsuite-tools/multilib/expect-64bit.xml

@@ -21 +21 @@
   <sect2 role="installation">
     <title>Installation of Expect</title>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"