Changeset 28e6dc4 for BOOK/final-system

Timestamp:

Jun 2, 2008, 9:33:22 AM (17 years ago)

Author:

Ken Moffat <zarniwhoop@…>

Branches:

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

Children:

7b7f61b2

Parents:

3c2b611

Message:

Fix c++ tests in glibc and binutils on pure64 builds for multilib-capable architectures: the temporary compiler tries to link to libstdc++ in /usr/lib64, e.g. cancel24.out, tst-chk4.out and others in glibc, and in binutils ld-elf/shared libdl3{a,b,c}.so and libnew1{a,b}.so.

Location:

BOOK/final-system

Files:

• 64/binutils.xml (modified) (1 diff)
• x86_64-64/binutils.xml (modified) (1 diff)

BOOK/final-system/64/binutils.xml

@@ -98 +98 @@
     xpointer="xpointer(//*[@os='q'])"/>
 
+    <para os="w1">Now that the tests have completed, remove the symlinks in
+    /usr/lib64 - they should be the only things in that directory, so we
+    can remove it without force :</para>
+
+<screen os="w2"><userinput>rm -v /usr/lib/libstd*so*
+rmdir -v /usr/lib64</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"

BOOK/final-system/x86_64-64/binutils.xml

@@ -108 +108 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='w2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='r'])"/>