[Clfs-commits] commit: r3909 - in /trunk/BOOK: final-system/64/binutils.xml final-system/x86_64-64/binutils.xml introduction/mips64-64/changelog.xml introduction/sparc64-64/changelog.xml introduction/x86_64-64/changelog.xml

[svn at cross-lfs.org]

Author: ken
Date: Mon Jun  2 17:24:58 2008
New Revision: 3909

Log:
For pure64 builds on multilib-capable architectures, ensure libiberty.a does not install into /usr/lib64.

Modified:
    trunk/BOOK/final-system/64/binutils.xml
    trunk/BOOK/final-system/x86_64-64/binutils.xml
    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/final-system/64/binutils.xml
==============================================================================
--- trunk/BOOK/final-system/64/binutils.xml (original)
+++ trunk/BOOK/final-system/64/binutils.xml Mon Jun  2 17:24:58 2008
@@ -48,6 +48,14 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <para os="q1">Libiberty uses <command>gcc -print-multi-os-directory</command>
+    to determine where to install libiberty.a.  Because our temporary gcc is
+    still multilib-aware, the command returns <literal>../lib64</literal> which
+    causes the archive to be installed into /usr/lib64.  The following sed will
+    prevent this:</para>
+
+<screen os="q2"><userinput>sed -i 's%\(^MULTIOSDIR = \).*%\1 ../lib%' libiberty/Makefile.in</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"

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 17:24:58 2008
@@ -48,6 +48,14 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='q1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='q2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"

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 17:24:58 2008
@@ -40,6 +40,8 @@
 	  <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>
+	  <para>[ken] - ensure binutils does not install libiberty.a into
+	  /usr/lib64.</para>
         </listitem>
       </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 17:24:58 2008
@@ -40,6 +40,8 @@
 	  <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>
+	  <para>[ken] - ensure binutils does not install libiberty.a into
+	  /usr/lib64.</para>
         </listitem>
       </itemizedlist>
     </listitem>

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 17:24:58 2008
@@ -40,6 +40,8 @@
 	  <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>
+	  <para>[ken] - ensure binutils does not install libiberty.a into
+	  /usr/lib64.</para>
         </listitem>
       </itemizedlist>
     </listitem>