Changeset 57e2e06

Timestamp:

Jul 6, 2009, 3:35:49 PM (15 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

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

Children:

79e1de7

Parents:

fddcf74

Message:

Wrap the pl.hh header installed by ppl in the final system.

Location:

BOOK/final-system

Files:

• mips64-chapter.xml (modified) (1 diff)
• mips64/ppl-64bit.xml (added)
• multilib/ppl-64bit.xml (modified) (1 diff)
• multilib/ppl-n32.xml (modified) (1 diff)
• multilib/ppl.xml (modified) (1 diff)

BOOK/final-system/mips64-chapter.xml

@@ -30 +30 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ppl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ppl-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ppl-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/ppl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/cloog-ppl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/cloog-ppl-n32.xml"/>

BOOK/final-system/multilib/ppl-64bit.xml

@@ -70 +70 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <para os="j">Create the 64bit header file:</para>
+
+<screen os="k"><userinput>mv -v /usr/include/ppl{,-64}.hh</userinput></screen>
+
+    <para os="l">Finally, create a stub header in the place of the originals:</para>
+
+<screen os="m"><userinput>cat &gt; /usr/include/ppl.hh &lt;&lt; "EOF"
+/* ppl.hh - Stub Header  */
+#ifndef __STUB__PPL_HH__
+#define __STUB__PPL_HH__
+
+#if defined(__x86_64__) || \
+    defined(__sparc64__) || \
+    defined(__arch64__) || \
+    defined(__powerpc64__) || \
+    defined (__s390x__)
+# include "ppl-64.h"
+#else
+# include "ppl-32.h"
+#endif
+
+#endif /* __STUB__PPL_HH__ */
+EOF</userinput></screen>
+
   </sect2>
 

BOOK/final-system/multilib/ppl-n32.xml

@@ -71 +71 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <para os="j">Create the N32 header file:</para>
+
+<screen os="k"><userinput>mv -v /usr/include/ppl{,-n32}.hh</userinput></screen>
+
   </sect2>
 

BOOK/final-system/multilib/ppl.xml

@@ -71 +71 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <para os="j">One of the headers installed by PPL is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of PPL. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
+
+<screen os="k"><userinput>mv -v /usr/include/ppl{,-32}.hh</userinput></screen>
+
+
   </sect2>