Changeset 6fcaede for BOOK/final-system/multilib/ppl.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.xml (modified) (2 diffs)

BOOK/final-system/multilib/ppl.xml

@@ -37 +37 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
+<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD32}" \
+    CXX="g++ -isystem /usr/include ${BUILD32}" \
     LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" \
-        ./configure --prefix=/usr --host=${CLFS_TARGET32} --enable-shared \
-        --with-libgmp-prefix=/usr --with-libgmpxx-prefix=/usr</userinput></screen>
+    ./configure --prefix=/usr --host=${CLFS_TARGET32} \
+    --enable-shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -70 +71 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <para os="m1">Prepare <filename>ppl-config</filename> to be wrapped by
+    the multiarch wrapper:</para>
+
+<screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-32}</userinput></screen>
+
+    <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>