Changeset 7b7f61b2 for BOOK/final-system

Timestamp:

Jun 2, 2008, 10:24:58 AM (16 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:

22b0f8e

Parents:

28e6dc4

Message:

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

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

@@ -49 +49 @@
     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"

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

@@ -49 +49 @@
     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"