Changeset 6fcaede for BOOK/final-system/multilib/ppl-64bit.xml

Timestamp:

Jul 7, 2009, 8:49:42 AM (15 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

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

Children:

b26d64d

Parents:

4261659 (diff), 53750600 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of git@…:cross-lfs

File:

• BOOK/final-system/multilib/ppl-64bit.xml (modified) (2 diffs)

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

@@ -36 +36 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
-    LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" ./configure --prefix=/usr \
-        --libdir=/usr/lib64 --enable-shared \
-    --with-libgmp-prefix=/usr --with-libgmpxx-prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD64}" \
+    CXX="g++ -isystem /usr/include ${BUILD64}" \
+    LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" \
+    ./configure --prefix=/usr \
+    --libdir=/usr/lib64 --enable-shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -69 +70 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <para os="m1">Prepare <filename>ppl-config</filename> to be wrapped by
+    the multiarch wrapper and then wrap it:</para>
+
+<screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-64}
+ln -svf multiarch_wrapper /usr/bin/ppl-config</userinput></screen>
+
+    <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>