Changeset d8f87e8 for BOOK/final-system/multilib

Timestamp:

Jun 7, 2009, 9:43:43 PM (16 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

2026a2e

Parents:

d06a4e5

Message:

This commit will address most of the EGLIBC test suite failures

Location:

BOOK/final-system/multilib

Files:

• eglibc-64bit.xml (modified) (1 diff)
• eglibc.xml (modified) (1 diff)

BOOK/final-system/multilib/eglibc-64bit.xml

@@ -21 +21 @@
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l1'])"/>
+
+<screen os="l2"><userinput>LINKER=$(readelf -l $(file /tools/lib64/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
+sed -i "s|libs -o|libs -L/usr/lib64 -Wl,-dynamic-linker=${LINKER} -o|" \
+  scripts/test-installation.pl
+unset LINKER</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/multilib/eglibc.xml

@@ -26 +26 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"