Changeset 3908

Timestamp:

06/02/08 16:33:22 (6 months ago)

Author:

ken

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.

Files:

• trunk/BOOK/boot/64/createfiles.xml (added)
• trunk/BOOK/boot/mips64-64-chapter.xml (modified) (1 diff)
• trunk/BOOK/boot/sparc64-64-chapter.xml (modified) (1 diff)
• trunk/BOOK/boot/x86_64-64-chapter.xml (modified) (1 diff)
• trunk/BOOK/chroot/64/createfiles.xml (added)
• trunk/BOOK/chroot/mips64-64-chapter.xml (modified) (1 diff)
• trunk/BOOK/chroot/sparc64-64-chapter.xml (modified) (1 diff)
• trunk/BOOK/chroot/x86_64-64-chapter.xml (modified) (1 diff)
• trunk/BOOK/final-system/64/binutils.xml (modified) (1 diff)
• trunk/BOOK/final-system/x86_64-64/binutils.xml (modified) (1 diff)
• trunk/BOOK/general.ent (modified) (1 diff)
• trunk/BOOK/introduction/mips64-64/changelog.xml (modified) (1 diff)
• trunk/BOOK/introduction/sparc64-64/changelog.xml (modified) (1 diff)
• trunk/BOOK/introduction/x86_64-64/changelog.xml (modified) (1 diff)

trunk/BOOK/boot/mips64-64-chapter.xml

@@ -15 +15 @@
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/bootloaders.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/creatingdirs.xml"/>
-common
+64
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/sysvinit.xml"/>

trunk/BOOK/boot/sparc64-64-chapter.xml

@@ -14 +14 @@
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-common
+64
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/sysvinit.xml"/>

trunk/BOOK/boot/x86_64-64-chapter.xml

@@ -14 +14 @@
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-common
+64
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>

trunk/BOOK/chroot/mips64-64-chapter.xml

@@ -19 +19 @@
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/creatingdirs.xml"/>
-common
+64
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>

trunk/BOOK/chroot/sparc64-64-chapter.xml

@@ -19 +19 @@
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-common
+64
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>

trunk/BOOK/chroot/x86_64-64-chapter.xml

@@ -19 +19 @@
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-common
+64
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>

trunk/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"

trunk/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'])"/>

trunk/BOOK/general.ent

@@ -1 +1 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-5
-Feburary
-18
+6
+June
+02
-<!ENTITY year "2008"> <!-- Use four digits -->
-

trunk/BOOK/introduction/mips64-64/changelog.xml

@@ -35 +35 @@
-
-    <listitem>
+      <para>June 02, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - create libstdc++.so symlinks in /usr/lib64 so that the
+          glibc and ld tests all link, and delete them safely before installing
+          binutils.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
-      <para>November 21, 2006</para>
-      <itemizedlist>

trunk/BOOK/introduction/sparc64-64/changelog.xml

@@ -35 +35 @@
-
-    <listitem>
-
+
+
+
+
+
+
+
+
+
+
+
+
-      <itemizedlist>
-        <listitem>

trunk/BOOK/introduction/x86_64-64/changelog.xml

@@ -33 +33 @@
-
--->
+
+    <listitem>
+      <para>June 02, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - create libstdc++.so symlinks in /usr/lib64 so that the
+          glibc and ld tests all link, and delete them safely before installing
+          binutils.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
-
-    <listitem>