Index: BOOK/cross-tools/common/cloog-ppl.xml
===================================================================
--- BOOK/cross-tools/common/cloog-ppl.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/cross-tools/common/cloog-ppl.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -37,5 +37,5 @@
LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
./configure --prefix=/cross-tools --enable-shared --with-bits=gmp \
- --with-gmp=/cross-tools --with-ppl=/cross-tools
+ --with-gmp=/cross-tools --with-ppl=/cross-tools
Compile the package:
Index: BOOK/cross-tools/common/ppl.xml
===================================================================
--- BOOK/cross-tools/common/ppl.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/cross-tools/common/ppl.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -37,6 +37,7 @@
LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
./configure --prefix=/cross-tools --enable-shared \
- --enable-interfaces="c,cxx" \
- --with-libgmp-prefix=/cross-tools --with-libgmpxx-prefix=/cross-tools
+ --enable-interfaces="c,cxx" \
+ --with-libgmp-prefix=/cross-tools \
+ --with-libgmpxx-prefix=/cross-tools
Compile the package:
Index: BOOK/final-system/common/cloog-ppl.xml
===================================================================
--- BOOK/final-system/common/cloog-ppl.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/common/cloog-ppl.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -32,6 +32,6 @@
CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
- ./configure --prefix=/usr --enable-shared --with-gmp=/usr \
- --with-ppl=/usr
+ ./configure --prefix=/usr --enable-shared --with-gmp \
+ --with-ppl
Compile the package:
Index: BOOK/final-system/common/iproute2.xml
===================================================================
--- BOOK/final-system/common/iproute2.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/common/iproute2.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -38,5 +38,5 @@
Compile the package:
-make DESTDIR=/ DOCDIR=/usr/share/doc/iproute2 \
+make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
MANDIR=/usr/share/man
@@ -45,5 +45,5 @@
- DESTDIR=/
+ DESTDIR=
This option overrides the default DESTDIR of /usr, so that
@@ -69,5 +69,5 @@
Install the package:
-make DOCDIR=/usr/share/doc/iproute2 \
+make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
MANDIR=/usr/share/man install
Index: BOOK/final-system/common/ppl.xml
===================================================================
--- BOOK/final-system/common/ppl.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/common/ppl.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -30,7 +30,8 @@
Prepare PPL for compilation:
-CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
- ./configure --prefix=/usr --enable-shared --with-libgmp-prefix=/usr \
- --with-libgmpxx-prefix=/usr
+CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include" \
+ CXX="g++ -isystem /usr/include" \
+ LDFLAGS="-Wl,-rpath-link,/lib" \
+ ./configure --prefix=/usr --enable-shared
Compile the package:
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/mips64-chapter.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -30,5 +30,5 @@
-
+
Index: BOOK/final-system/mips64/ppl-64bit.xml
===================================================================
--- BOOK/final-system/mips64/ppl-64bit.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
+++ BOOK/final-system/mips64/ppl-64bit.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -0,0 +1,112 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+ PPL-&ppl-version; 64 Bit
+
+
+ PPL
+
+
+
+
+
+ Installation of PPL
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Finally, create a stub header in the place of the originals:
+
+cat > /usr/include/ppl.h << "EOF"
+/* ppl.hh - Stub Header */
+#ifndef __STUB__PPL_HH__
+#define __STUB__PPL_HH__
+
+#include <sgidefs.h>
+
+#if (_MIPS_SIM == _ABIO32)
+# include "ppl-32.hh"
+#elif (_MIPS_SIM == _ABIN32)
+# include "ppl-n32.hh"
+#elif (_MIPS_SIM == _ABI64)
+# include "ppl-64.hh"
+#endif
+
+#endif /* __STUB__PPL_HH__ */
+EOF
+
+
+
+
+
+
Index: BOOK/final-system/multilib/cloog-ppl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/cloog-ppl-64bit.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/multilib/cloog-ppl-64bit.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -38,6 +38,6 @@
CC="gcc -isystem /usr/include ${BUILD64}" \
LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" ./configure --prefix=/usr \
- --libdir=/usr/lib64 --enable-shared --with-gmp=/usr \
- --with-ppl=/usr
+ --libdir=/usr/lib64 --enable-shared --with-gmp \
+ --with-ppl
-CC="gcc -isystem /usr/include ${BUILDN32}" \
+CC="gcc -isystem /usr/include ${BUILDM32}" \
LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ./configure --prefix=/usr \
- --libdir=/usr/lib32 --enable-shared \
- --with-libgmp-prefix=/usr --with-libgmpxx-prefix=/usr
+ --libdir=/usr/lib32 --enable-shared --with-gmp \
+ --with-ppl
CC="gcc -isystem /usr/include ${BUILD32}" \
LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" ./configure --prefix=/usr \
- --host=${CLFS_TARGET32} --enable-shared \
- --with-gmp=/usr --with-ppl=/usr
+ --host=${CLFS_TARGET32} --enable-shared \
+ --with-gmp --with-ppl
-make CC="gcc ${BUILD64}" DESTDIR=/ LIBDIR=/usr/lib64 \
+make CC="gcc ${BUILD64}" DESTDIR= LIBDIR=/usr/lib64 \
DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man
@@ -53,5 +53,5 @@
xpointer="xpointer(//*[@os='e'])"/>
-make LIBDIR=/usr/lib64 \
+make DESTDIR= LIBDIR=/usr/lib64 \
DOCDIR=/usr/share/doc/iproute2 \
MANDIR=/usr/share/man install
Index: BOOK/final-system/multilib/ppl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/ppl-64bit.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/multilib/ppl-64bit.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -36,8 +36,9 @@
xpointer="xpointer(//*[@os='a'])"/>
-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
+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
+ Prepare ppl-config to be wrapped by
+ the multiarch wrapper and then wrap it:
+
+mv -v /usr/bin/ppl-config{,-64}
+ln -svf multiarch_wrapper /usr/bin/ppl-config
+
+ Create the 64bit header file:
+
+mv -v /usr/include/ppl{,-64}.hh
+
+ Finally, create a stub header in the place of the originals:
+
+cat > /usr/include/ppl.hh << "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
+
Index: BOOK/final-system/multilib/ppl-n32.xml
===================================================================
--- BOOK/final-system/multilib/ppl-n32.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/multilib/ppl-n32.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -37,8 +37,9 @@
xpointer="xpointer(//*[@os='a'])"/>
-CC="gcc -isystem /usr/include ${BUILDN32}" \
- LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ./configure --prefix=/usr \
- --libdir=/usr/lib32 --enable-shared --with-libgmp-prefix=/usr \
- --with-libgmpxx-prefix=/usr
+CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILDN32}" \
+ CXX="g++ -isystem /usr/include ${BUILDN32}" \
+ LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" \
+ ./configure --prefix=/usr \
+ --libdir=/usr/lib32 --enable-shared
+
+
+mv -v /usr/bin/ppl-config{,-n32}
+
+ Create the N32 header file:
+
+mv -v /usr/include/ppl{,-n32}.hh
+
Index: BOOK/final-system/multilib/ppl.xml
===================================================================
--- BOOK/final-system/multilib/ppl.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/multilib/ppl.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -37,8 +37,9 @@
xpointer="xpointer(//*[@os='a'])"/>
-CC="gcc -isystem /usr/include ${BUILD32}" \
+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
+ ./configure --prefix=/usr --host=${CLFS_TARGET32} \
+ --enable-shared
+ Prepare ppl-config to be wrapped by
+ the multiarch wrapper:
+
+mv -v /usr/bin/ppl-config{,-32}
+
+ 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:
+
+mv -v /usr/include/ppl{,-32}.hh
+
+
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/patches.ent (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -1,5 +1,5 @@
-
+
Index: BOOK/temp-system/64/cloog-ppl.xml
===================================================================
--- BOOK/temp-system/64/cloog-ppl.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/temp-system/64/cloog-ppl.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -38,6 +38,6 @@
CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
- --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
- --enable-shared --with-gmp=/tools --with-ppl=/tools
+ --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
+ --enable-shared --with-gmp=/tools --with-ppl=/tools
- Now we copy the files that are placed in /tools/lib64
- to /tools/lib.
- We also delete the /tools/lib64 directory:
-
-cp -va /tools/lib64/* /tools/lib
-rm -rvf /tools/lib64
-
Index: BOOK/temp-system/common/cloog-ppl.xml
===================================================================
--- BOOK/temp-system/common/cloog-ppl.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/temp-system/common/cloog-ppl.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -36,6 +36,6 @@
./configure --prefix=/tools \
- --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
- --with-ppl=/tools --with-gmp=/tools
+ --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
+ --with-ppl=/tools --with-gmp=/tools
Compile the package:
Index: BOOK/temp-system/common/gcc.xml
===================================================================
--- BOOK/temp-system/common/gcc.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/temp-system/common/gcc.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -98,9 +98,6 @@
- When gcc was configured it was told to find MPFR, GMP, PPL,
- and CLooG-PPL in /tools. However, when compiling gcc uses these same values
- for building native helper programs that run on the host. The following sed
- will change those values to look in cross-tools for the native programs
- only:
+ The following will prevent GCC from looking in the wrong
+ directories for headers and libraries:
cp Makefile{,.orig}
Index: BOOK/temp-system/common/ppl.xml
===================================================================
--- BOOK/temp-system/common/ppl.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/temp-system/common/ppl.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -37,6 +37,6 @@
./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --enable-interfaces="c,cxx" \
- --with-libgmp-prefix=/tools --with-libgmpxx-prefix=/tools
+ --enable-interfaces="c,cxx" \
+ --with-libgmp-prefix=/tools --with-libgmpxx-prefix=/tools
PPL doesn't check to see if GMP was compiled with support for
Index: BOOK/temp-system/multilib/ppl.xml
===================================================================
--- BOOK/temp-system/multilib/ppl.xml (revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/temp-system/multilib/ppl.xml (revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -39,6 +39,6 @@
CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --enable-interfaces="c,cxx" --libdir=/tools/lib64 --enable-shared \
- --with-libgmp-prefix=/tools --with-libgmpxx-prefix=/tools
+ --enable-interfaces="c,cxx" --libdir=/tools/lib64 --enable-shared \
+ --with-libgmp-prefix=/tools --with-libgmpxx-prefix=/tools
+
-