[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. b6831b6206effa50faabc69df402326d7f4812a8
git
git at cross-lfs.org
Sat Apr 16 17:45:47 PDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via b6831b6206effa50faabc69df402326d7f4812a8 (commit)
from 7d97f36d6c68f7a3e42aeabc0732ea935a9c68d5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b6831b6206effa50faabc69df402326d7f4812a8
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sat Apr 16 20:44:45 2011 -0400
Update the LDFLAGS in the final-system between the installation
of EGLIBC and the installation of GCC. This should fix build errors
in a few odd situations, but it is also correct now. Before /usr/lib*
was not being set in rpath-link, just /lib*.
diff --git a/BOOK/final-system/64/binutils.xml b/BOOK/final-system/64/binutils.xml
index 0252267..fc733de 100644
--- a/BOOK/final-system/64/binutils.xml
+++ b/BOOK/final-system/64/binutils.xml
@@ -54,8 +54,8 @@
xpointer="xpointer(//*[@os='i'])"/>
<screen os="ca"><userinput>CC="gcc -isystem /usr/include" \
- LDFLAGS="-Wl,-rpath-link,/lib" \
- ../binutils-&binutils-version;/configure --prefix=/usr \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
+ ../binutils-&binutils-version;/configure --prefix=/usr \
--libdir=/usr/lib --enable-shared \
--disable-multilib --enable-64-bit-bfd</userinput></screen>
diff --git a/BOOK/final-system/common/binutils.xml b/BOOK/final-system/common/binutils.xml
index 65a28c2..3f010f1 100644
--- a/BOOK/final-system/common/binutils.xml
+++ b/BOOK/final-system/common/binutils.xml
@@ -48,8 +48,8 @@ cd ../binutils-build</userinput></screen>
<para os="i">Prepare Binutils for compilation:</para>
<screen os="ca"><userinput>CC="gcc -isystem /usr/include" \
- LDFLAGS="-Wl,-rpath-link,/lib" \
- ../binutils-&binutils-version;/configure --prefix=/usr \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
+ ../binutils-&binutils-version;/configure --prefix=/usr \
--enable-shared</userinput></screen>
<para os="j">Compile the package:</para>
diff --git a/BOOK/final-system/common/cloog-ppl.xml b/BOOK/final-system/common/cloog-ppl.xml
index a94716f..23398d7 100644
--- a/BOOK/final-system/common/cloog-ppl.xml
+++ b/BOOK/final-system/common/cloog-ppl.xml
@@ -29,8 +29,9 @@
<para os="a">Prepare CLooG-PPL for compilation:</para>
-<screen os="b"><userinput>CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
- ./configure --prefix=/usr --enable-shared --with-gmp \
+<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
+ ./configure --prefix=/usr --enable-shared --with-gmp \
--with-ppl</userinput></screen>
<para os="c">Compile the package:</para>
diff --git a/BOOK/final-system/common/gcc.xml b/BOOK/final-system/common/gcc.xml
index 2697bb7..e762c14 100644
--- a/BOOK/final-system/common/gcc.xml
+++ b/BOOK/final-system/common/gcc.xml
@@ -40,9 +40,10 @@ cd ../gcc-build</userinput></screen>
<para os="h">Prepare GCC for compilation:</para>
-<screen os="i"><userinput>CC="gcc -Wl,-rpath-link,/lib -isystem /usr/include" \
- CXX="g++ -Wl,-rpath-link,/lib -isystem /usr/include" \
- ../gcc-&gcc-version;/configure --prefix=/usr \
+<screen os="i"><userinput>CC="gcc -isystem /usr/include" \
+CXX="g++ -isystem /usr/include" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
+ ../gcc-&gcc-version;/configure --prefix=/usr \
--libexecdir=/usr/lib --enable-shared --enable-threads=posix \
--enable-__cxa_atexit --enable-c99 --enable-long-long \
--enable-clocale=gnu --enable-languages=c,c++ \
diff --git a/BOOK/final-system/common/gmp.xml b/BOOK/final-system/common/gmp.xml
index 77673dd..88d4a87 100644
--- a/BOOK/final-system/common/gmp.xml
+++ b/BOOK/final-system/common/gmp.xml
@@ -48,8 +48,9 @@ mv -v config{fsf,}.sub</userinput></screen>
<para os="a">Prepare GMP for compilation:</para>
<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include" \
- CXX="g++ -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
- ./configure --prefix=/usr --enable-cxx --enable-mpbsd</userinput></screen>
+CXX="g++ -isystem /usr/include" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
+ ./configure --prefix=/usr --enable-cxx --enable-mpbsd</userinput></screen>
<para os="c">Compile the package:</para>
diff --git a/BOOK/final-system/common/mpc.xml b/BOOK/final-system/common/mpc.xml
index 9c3797f..eeff481 100644
--- a/BOOK/final-system/common/mpc.xml
+++ b/BOOK/final-system/common/mpc.xml
@@ -28,8 +28,8 @@
<para os="a">Prepare MPC for compilation:</para>
<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
-LDFLAGS="-Wl,-rpath-link,/lib" EGREP="grep -E" \
-./configure --prefix=/usr</userinput></screen>
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
+ EGREP="grep -E" ./configure --prefix=/usr</userinput></screen>
<para os="c">Compile the package:</para>
diff --git a/BOOK/final-system/common/mpfr.xml b/BOOK/final-system/common/mpfr.xml
index 8c318d4..2745063 100644
--- a/BOOK/final-system/common/mpfr.xml
+++ b/BOOK/final-system/common/mpfr.xml
@@ -27,9 +27,10 @@
<para os="a">Prepare MPFR for compilation:</para>
-<screen os="b"><userinput>CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
- ./configure --prefix=/usr --enable-shared \
- --with-gmp=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
+ ./configure --prefix=/usr --enable-shared \
+ --with-gmp=/usr</userinput></screen>
<para os="c">Compile the package:</para>
diff --git a/BOOK/final-system/common/ppl.xml b/BOOK/final-system/common/ppl.xml
index 2035231..afd8639 100644
--- a/BOOK/final-system/common/ppl.xml
+++ b/BOOK/final-system/common/ppl.xml
@@ -29,10 +29,10 @@
<para os="a">Prepare PPL for compilation:</para>
<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include" \
- CXX="g++ -isystem /usr/include" \
- LDFLAGS="-Wl,-rpath-link,/lib" \
- ./configure --prefix=/usr --enable-shared \
- --disable-optimization</userinput></screen>
+CXX="g++ -isystem /usr/include" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
+ ./configure --prefix=/usr --enable-shared \
+ --disable-optimization</userinput></screen>
<para os="c">Compile the package:</para>
diff --git a/BOOK/final-system/common/zlib.xml b/BOOK/final-system/common/zlib.xml
index c3a2ee2..d8f5cb2 100644
--- a/BOOK/final-system/common/zlib.xml
+++ b/BOOK/final-system/common/zlib.xml
@@ -27,8 +27,10 @@
<para os="a">Prepare Zlib for compilation:</para>
-<screen os="b"><userinput>CC="gcc -isystem /usr/include" CXX="g++ -isystem /usr/include" \
- LDFLAGS="-Wl,-rpath-link,/lib" ./configure --prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
+CXX="g++ -isystem /usr/include" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
+ ./configure --prefix=/usr</userinput></screen>
<para os="c">Compile the package:</para>
diff --git a/BOOK/final-system/mips64/binutils.xml b/BOOK/final-system/mips64/binutils.xml
index 482e779..cf6248c 100644
--- a/BOOK/final-system/mips64/binutils.xml
+++ b/BOOK/final-system/mips64/binutils.xml
@@ -54,8 +54,8 @@
xpointer="xpointer(//*[@os='i'])"/>
<screen os="ca"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
- LDFLAGS="-Wl,-rpath-link,/lib64:/lib32:/lib ${BUILD64}" \
- ../binutils-&binutils-version;/configure --prefix=/usr \
+LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib32:/lib32:/usr/lib:/lib ${BUILD64}" \
+ ../binutils-&binutils-version;/configure --prefix=/usr \
--enable-shared --enable-64-bit-bfd --libdir=/usr/lib64</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/mips64/gcc.xml b/BOOK/final-system/mips64/gcc.xml
index be33639..b7cf968 100644
--- a/BOOK/final-system/mips64/gcc.xml
+++ b/BOOK/final-system/mips64/gcc.xml
@@ -41,9 +41,10 @@
href="../common/gcc.xml"
xpointer="xpointer(//*[@os='h'])"/>
-<screen os="i"><userinput>CC="gcc -Wl,-rpath-link,/lib64:/lib32:/lib -isystem /usr/include ${BUILD64}" \
- CXX="g++ -Wl,-rpath-link,/lib64:/lib32:/lib -isystem /usr/include ${BUILD64}" \
- ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
+<screen os="i"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
+CXX="g++ -isystem /usr/include ${BUILD64}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib32:/lib32:/usr/lib:/lib" \
+ ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
--libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
--enable-__cxa_atexit --enable-c99 --enable-long-long --with-abi=64 \
--enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
diff --git a/BOOK/final-system/multilib/binutils.xml b/BOOK/final-system/multilib/binutils.xml
index bf443ae..e5ca867 100644
--- a/BOOK/final-system/multilib/binutils.xml
+++ b/BOOK/final-system/multilib/binutils.xml
@@ -54,8 +54,8 @@
xpointer="xpointer(//*[@os='i'])"/>
<screen os="ca"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
- LDFLAGS="-Wl,-rpath-link,/lib64:/lib ${BUILD64}" \
- ../binutils-&binutils-version;/configure --prefix=/usr \
+LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib ${BUILD64}" \
+ ../binutils-&binutils-version;/configure --prefix=/usr \
--enable-shared --enable-64-bit-bfd --libdir=/usr/lib64</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/cloog-ppl-64bit.xml b/BOOK/final-system/multilib/cloog-ppl-64bit.xml
index ea7484f..7109e15 100644
--- a/BOOK/final-system/multilib/cloog-ppl-64bit.xml
+++ b/BOOK/final-system/multilib/cloog-ppl-64bit.xml
@@ -26,7 +26,8 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
- LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" ./configure --prefix=/usr \
+LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
+ ./configure --prefix=/usr \
--libdir=/usr/lib64 --enable-shared --with-gmp \
--with-ppl</userinput></screen>
diff --git a/BOOK/final-system/multilib/cloog-ppl-n32.xml b/BOOK/final-system/multilib/cloog-ppl-n32.xml
index 22d8f77..edc2e70 100644
--- a/BOOK/final-system/multilib/cloog-ppl-n32.xml
+++ b/BOOK/final-system/multilib/cloog-ppl-n32.xml
@@ -26,8 +26,9 @@
href="../common/cloog-ppl.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDM32}" \
- LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
+ ./configure --prefix=/usr \
--libdir=/usr/lib32 --enable-shared --with-gmp \
--with-ppl</userinput></screen>
diff --git a/BOOK/final-system/multilib/cloog-ppl.xml b/BOOK/final-system/multilib/cloog-ppl.xml
index e585320..d39145b 100644
--- a/BOOK/final-system/multilib/cloog-ppl.xml
+++ b/BOOK/final-system/multilib/cloog-ppl.xml
@@ -27,7 +27,8 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
- LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" ./configure --prefix=/usr \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
+ ./configure --prefix=/usr \
--host=${CLFS_TARGET32} --enable-shared \
--with-gmp --with-ppl</userinput></screen>
diff --git a/BOOK/final-system/multilib/gcc.xml b/BOOK/final-system/multilib/gcc.xml
index df69e10..132a4e4 100644
--- a/BOOK/final-system/multilib/gcc.xml
+++ b/BOOK/final-system/multilib/gcc.xml
@@ -41,9 +41,10 @@
href="../common/gcc.xml"
xpointer="xpointer(//*[@os='h'])"/>
-<screen os="i"><userinput>CC="gcc -Wl,-rpath-link,/lib64:/lib -isystem /usr/include ${BUILD64}" \
- CXX="g++ -Wl,-rpath-link,/lib64:/lib -isystem /usr/include ${BUILD64}" \
- ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
+<screen os="i"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
+CXX="g++ -isystem /usr/include ${BUILD64}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib" \
+ ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
--libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
--enable-__cxa_atexit --enable-c99 --enable-long-long \
--enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
diff --git a/BOOK/final-system/multilib/gmp-64bit.xml b/BOOK/final-system/multilib/gmp-64bit.xml
index 9b05996..f00441f 100644
--- a/BOOK/final-system/multilib/gmp-64bit.xml
+++ b/BOOK/final-system/multilib/gmp-64bit.xml
@@ -40,8 +40,9 @@
xpointer="xpointer(//*[@os='a'])"/>
<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 \
+CXX="g++ -isystem /usr/include ${BUILD64}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
+ ./configure --prefix=/usr \
--libdir=/usr/lib64 --enable-cxx --enable-mpbsd</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/gmp-n32.xml b/BOOK/final-system/multilib/gmp-n32.xml
index 6cef939..b575293 100644
--- a/BOOK/final-system/multilib/gmp-n32.xml
+++ b/BOOK/final-system/multilib/gmp-n32.xml
@@ -42,9 +42,9 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILDN32}" \
- CXX="g++ -isystem /usr/include ${BUILDN32}" \
- LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ABI=n32 \
- ./configure --prefix=/usr \
+CXX="g++ -isystem /usr/include ${BUILDN32}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
+ ABI=n32 ./configure --prefix=/usr \
--libdir=/usr/lib32 --enable-cxx --enable-mpbsd</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/gmp.xml b/BOOK/final-system/multilib/gmp.xml
index 665c16d..2e38352 100644
--- a/BOOK/final-system/multilib/gmp.xml
+++ b/BOOK/final-system/multilib/gmp.xml
@@ -41,9 +41,9 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD32}" \
- CXX="g++ -isystem /usr/include ${BUILD32}" \
- LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" ABI=32 \
- ./configure --prefix=/usr \
+CXX="g++ -isystem /usr/include ${BUILD32}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
+ ABI=32 ./configure --prefix=/usr \
-enable-cxx --enable-mpbsd</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/mpc-64bit.xml b/BOOK/final-system/multilib/mpc-64bit.xml
index a3aefa0..185178d 100644
--- a/BOOK/final-system/multilib/mpc-64bit.xml
+++ b/BOOK/final-system/multilib/mpc-64bit.xml
@@ -26,8 +26,8 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
-LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" EGREP="grep -E" \
-./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
+ EGREP="grep -E" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/mpc.xml"
diff --git a/BOOK/final-system/multilib/mpc-n32.xml b/BOOK/final-system/multilib/mpc-n32.xml
index 1a2a5d2..5501303 100644
--- a/BOOK/final-system/multilib/mpc-n32.xml
+++ b/BOOK/final-system/multilib/mpc-n32.xml
@@ -27,8 +27,8 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
-LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" EGREP="grep -E" \
-./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
+ EGREP="grep -E" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/mpc.xml"
diff --git a/BOOK/final-system/multilib/mpc.xml b/BOOK/final-system/multilib/mpc.xml
index e3ff470..a183318 100644
--- a/BOOK/final-system/multilib/mpc.xml
+++ b/BOOK/final-system/multilib/mpc.xml
@@ -27,8 +27,8 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
-LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" EGREP="grep -E" \
-./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
+ EGREP="grep -E" ./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/mpc.xml"
diff --git a/BOOK/final-system/multilib/mpfr-64bit.xml b/BOOK/final-system/multilib/mpfr-64bit.xml
index ed9eca6..81c0b5e 100644
--- a/BOOK/final-system/multilib/mpfr-64bit.xml
+++ b/BOOK/final-system/multilib/mpfr-64bit.xml
@@ -25,8 +25,9 @@
href="../common/mpfr.xml"
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</userinput></screen>
+<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
+ ./configure --prefix=/usr --libdir=/usr/lib64 --enable-shared</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/mpfr.xml"
diff --git a/BOOK/final-system/multilib/mpfr-n32.xml b/BOOK/final-system/multilib/mpfr-n32.xml
index 73c75b6..981a062 100644
--- a/BOOK/final-system/multilib/mpfr-n32.xml
+++ b/BOOK/final-system/multilib/mpfr-n32.xml
@@ -26,8 +26,9 @@
href="../common/mpfr.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" \
- ./configure --prefix=/usr --libdir=/usr/lib32 --enable-shared</userinput></screen>
+<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
+ ./configure --prefix=/usr --libdir=/usr/lib32 --enable-shared</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/mpfr.xml"
diff --git a/BOOK/final-system/multilib/mpfr.xml b/BOOK/final-system/multilib/mpfr.xml
index ab26ed2..a542829 100644
--- a/BOOK/final-system/multilib/mpfr.xml
+++ b/BOOK/final-system/multilib/mpfr.xml
@@ -26,8 +26,9 @@
href="../common/mpfr.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" \
- ./configure --prefix=/usr --host=${CLFS_TARGET32} --enable-shared</userinput></screen>
+<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
+ ./configure --prefix=/usr --host=${CLFS_TARGET32} --enable-shared</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/mpfr.xml"
diff --git a/BOOK/final-system/multilib/ppl-64bit.xml b/BOOK/final-system/multilib/ppl-64bit.xml
index df6a392..14b0931 100644
--- a/BOOK/final-system/multilib/ppl-64bit.xml
+++ b/BOOK/final-system/multilib/ppl-64bit.xml
@@ -26,10 +26,10 @@
xpointer="xpointer(//*[@os='a'])"/>
<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 --disable-optimization</userinput></screen>
+CXX="g++ -isystem /usr/include ${BUILD64}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
+ ./configure --prefix=/usr --libdir=/usr/lib64 \
+ --enable-shared --disable-optimization</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/ppl.xml"
diff --git a/BOOK/final-system/multilib/ppl-n32.xml b/BOOK/final-system/multilib/ppl-n32.xml
index 080af39..b52c1ca 100644
--- a/BOOK/final-system/multilib/ppl-n32.xml
+++ b/BOOK/final-system/multilib/ppl-n32.xml
@@ -27,10 +27,10 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>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 --disable-optimization</userinput></screen>
+CXX="g++ -isystem /usr/include ${BUILDN32}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
+ ./configure --prefix=/usr --libdir=/usr/lib32 \
+ --enable-shared --disable-optimization</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/ppl.xml"
diff --git a/BOOK/final-system/multilib/ppl.xml b/BOOK/final-system/multilib/ppl.xml
index 3c7bbb4..408a865 100644
--- a/BOOK/final-system/multilib/ppl.xml
+++ b/BOOK/final-system/multilib/ppl.xml
@@ -27,10 +27,10 @@
xpointer="xpointer(//*[@os='a'])"/>
<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 --disable-optimization</userinput></screen>
+CXX="g++ -isystem /usr/include ${BUILD32}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
+ ./configure --prefix=/usr --host=${CLFS_TARGET32} \
+ --enable-shared --disable-optimization</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/ppl.xml"
diff --git a/BOOK/final-system/multilib/zlib-64bit.xml b/BOOK/final-system/multilib/zlib-64bit.xml
index 56db8b2..c2190f0 100644
--- a/BOOK/final-system/multilib/zlib-64bit.xml
+++ b/BOOK/final-system/multilib/zlib-64bit.xml
@@ -26,9 +26,9 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
- CXX="g++ -isystem /usr/include ${BUILD64}" \
- LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" \
- ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+CXX="g++ -isystem /usr/include ${BUILD64}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
+ ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="zlib.xml"
diff --git a/BOOK/final-system/multilib/zlib-n32.xml b/BOOK/final-system/multilib/zlib-n32.xml
index 78003f5..44b2090 100644
--- a/BOOK/final-system/multilib/zlib-n32.xml
+++ b/BOOK/final-system/multilib/zlib-n32.xml
@@ -27,9 +27,9 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
- CXX="g++ -isystem /usr/include ${BUILDN32}" \
- LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" \
- ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
+CXX="g++ -isystem /usr/include ${BUILDN32}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
+ ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="zlib.xml"
diff --git a/BOOK/final-system/multilib/zlib.xml b/BOOK/final-system/multilib/zlib.xml
index d3201d4..93fdd78 100644
--- a/BOOK/final-system/multilib/zlib.xml
+++ b/BOOK/final-system/multilib/zlib.xml
@@ -27,9 +27,9 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
- CXX="g++ -isystem /usr/include ${BUILD32}" \
- LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" \
- ./configure --prefix=/usr</userinput></screen>
+CXX="g++ -isystem /usr/include ${BUILD32}" \
+LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
+ ./configure --prefix=/usr</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/zlib.xml"
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/64/binutils.xml | 4 ++--
BOOK/final-system/common/binutils.xml | 4 ++--
BOOK/final-system/common/cloog-ppl.xml | 5 +++--
BOOK/final-system/common/gcc.xml | 7 ++++---
BOOK/final-system/common/gmp.xml | 5 +++--
BOOK/final-system/common/mpc.xml | 4 ++--
BOOK/final-system/common/mpfr.xml | 7 ++++---
BOOK/final-system/common/ppl.xml | 8 ++++----
BOOK/final-system/common/zlib.xml | 6 ++++--
BOOK/final-system/mips64/binutils.xml | 4 ++--
BOOK/final-system/mips64/gcc.xml | 7 ++++---
BOOK/final-system/multilib/binutils.xml | 4 ++--
BOOK/final-system/multilib/cloog-ppl-64bit.xml | 3 ++-
BOOK/final-system/multilib/cloog-ppl-n32.xml | 5 +++--
BOOK/final-system/multilib/cloog-ppl.xml | 3 ++-
BOOK/final-system/multilib/gcc.xml | 7 ++++---
BOOK/final-system/multilib/gmp-64bit.xml | 5 +++--
BOOK/final-system/multilib/gmp-n32.xml | 6 +++---
BOOK/final-system/multilib/gmp.xml | 6 +++---
BOOK/final-system/multilib/mpc-64bit.xml | 4 ++--
BOOK/final-system/multilib/mpc-n32.xml | 4 ++--
BOOK/final-system/multilib/mpc.xml | 4 ++--
BOOK/final-system/multilib/mpfr-64bit.xml | 5 +++--
BOOK/final-system/multilib/mpfr-n32.xml | 5 +++--
BOOK/final-system/multilib/mpfr.xml | 5 +++--
BOOK/final-system/multilib/ppl-64bit.xml | 8 ++++----
BOOK/final-system/multilib/ppl-n32.xml | 8 ++++----
BOOK/final-system/multilib/ppl.xml | 8 ++++----
BOOK/final-system/multilib/zlib-64bit.xml | 6 +++---
BOOK/final-system/multilib/zlib-n32.xml | 6 +++---
BOOK/final-system/multilib/zlib.xml | 6 +++---
31 files changed, 92 insertions(+), 77 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list