[Clfs-commits] commit: r3908 - in /trunk/BOOK: ./ boot/ boot/64/ chroot/ chroot/64/ final-system/64/ final-system/x86_64-64/ introduction/mips64-64/ introduction/sparc64-64/ introduction/x86_64-64/
svn at cross-lfs.org
svn at cross-lfs.org
Mon Jun 2 09:33:22 PDT 2008
Author: ken
Date: Mon Jun 2 16:33:22 2008
New Revision: 3908
Log:
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.
Added:
trunk/BOOK/boot/64/createfiles.xml
trunk/BOOK/chroot/64/createfiles.xml
Modified:
trunk/BOOK/boot/mips64-64-chapter.xml
trunk/BOOK/boot/sparc64-64-chapter.xml
trunk/BOOK/boot/x86_64-64-chapter.xml
trunk/BOOK/chroot/mips64-64-chapter.xml
trunk/BOOK/chroot/sparc64-64-chapter.xml
trunk/BOOK/chroot/x86_64-64-chapter.xml
trunk/BOOK/final-system/64/binutils.xml
trunk/BOOK/final-system/x86_64-64/binutils.xml
trunk/BOOK/general.ent
trunk/BOOK/introduction/mips64-64/changelog.xml
trunk/BOOK/introduction/sparc64-64/changelog.xml
trunk/BOOK/introduction/x86_64-64/changelog.xml
Modified: trunk/BOOK/boot/mips64-64-chapter.xml
==============================================================================
--- trunk/BOOK/boot/mips64-64-chapter.xml (original)
+++ trunk/BOOK/boot/mips64-64-chapter.xml Mon Jun 2 16:33:22 2008
@@ -14,7 +14,7 @@
<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="mips/bootloaders.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/creatingdirs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
Modified: trunk/BOOK/boot/sparc64-64-chapter.xml
==============================================================================
--- trunk/BOOK/boot/sparc64-64-chapter.xml (original)
+++ trunk/BOOK/boot/sparc64-64-chapter.xml Mon Jun 2 16:33:22 2008
@@ -13,7 +13,7 @@
<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"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
Modified: trunk/BOOK/boot/x86_64-64-chapter.xml
==============================================================================
--- trunk/BOOK/boot/x86_64-64-chapter.xml (original)
+++ trunk/BOOK/boot/x86_64-64-chapter.xml Mon Jun 2 16:33:22 2008
@@ -13,7 +13,7 @@
<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"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
Modified: trunk/BOOK/chroot/mips64-64-chapter.xml
==============================================================================
--- trunk/BOOK/chroot/mips64-64-chapter.xml (original)
+++ trunk/BOOK/chroot/mips64-64-chapter.xml Mon Jun 2 16:33:22 2008
@@ -18,7 +18,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
<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"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
Modified: trunk/BOOK/chroot/sparc64-64-chapter.xml
==============================================================================
--- trunk/BOOK/chroot/sparc64-64-chapter.xml (original)
+++ trunk/BOOK/chroot/sparc64-64-chapter.xml Mon Jun 2 16:33:22 2008
@@ -18,7 +18,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
<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"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
Modified: trunk/BOOK/chroot/x86_64-64-chapter.xml
==============================================================================
--- trunk/BOOK/chroot/x86_64-64-chapter.xml (original)
+++ trunk/BOOK/chroot/x86_64-64-chapter.xml Mon Jun 2 16:33:22 2008
@@ -18,7 +18,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
<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"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
Modified: trunk/BOOK/final-system/64/binutils.xml
==============================================================================
--- trunk/BOOK/final-system/64/binutils.xml (original)
+++ trunk/BOOK/final-system/64/binutils.xml Mon Jun 2 16:33:22 2008
@@ -97,6 +97,13 @@
href="../common/binutils.xml"
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"
xpointer="xpointer(//*[@os='r'])"/>
Modified: trunk/BOOK/final-system/x86_64-64/binutils.xml
==============================================================================
--- trunk/BOOK/final-system/x86_64-64/binutils.xml (original)
+++ trunk/BOOK/final-system/x86_64-64/binutils.xml Mon Jun 2 16:33:22 2008
@@ -107,6 +107,14 @@
<screen><userinput>rm -v /lib64</userinput></screen>
<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'])"/>
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent (original)
+++ trunk/BOOK/general.ent Mon Jun 2 16:33:22 2008
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY month "05"> <!-- Use two digits -->
-<!ENTITY month_name "Feburary">
-<!ENTITY day "18"> <!-- Use two digits -->
+<!ENTITY month "06"> <!-- Use two digits -->
+<!ENTITY month_name "June">
+<!ENTITY day "02"> <!-- Use two digits -->
<!ENTITY year "2008"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
Modified: trunk/BOOK/introduction/mips64-64/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/mips64-64/changelog.xml (original)
+++ trunk/BOOK/introduction/mips64-64/changelog.xml Mon Jun 2 16:33:22 2008
@@ -34,6 +34,17 @@
-->
<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>
<listitem>
Modified: trunk/BOOK/introduction/sparc64-64/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/sparc64-64/changelog.xml (original)
+++ trunk/BOOK/introduction/sparc64-64/changelog.xml Mon Jun 2 16:33:22 2008
@@ -34,7 +34,18 @@
-->
<listitem>
- <para>Feburary 3, 2008</para>
+ <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>February 3, 2008</para>
<itemizedlist>
<listitem>
<para>[jciccone] - Added a patch to the kernel that includes
Modified: trunk/BOOK/introduction/x86_64-64/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/x86_64-64/changelog.xml (original)
+++ trunk/BOOK/introduction/x86_64-64/changelog.xml Mon Jun 2 16:33:22 2008
@@ -32,6 +32,17 @@
</listitem>
-->
+
+ <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>January 22, 2008</para>
More information about the Clfs-commits
mailing list