Changeset 2b9574b in clfs-embedded for BOOK

Timestamp:

Oct 14, 2013, 8:07:18 AM (11 years ago)

Author:

Andrew Bradford <andrew@…>

Branches:

master

Children:

5efdb34

Parents:

8a77fbd

git-author:

Andrew Bradford <andrew@…> (10/09/13 11:02:12)

git-committer:

Andrew Bradford <andrew@…> (10/14/13 08:07:18)

Message:

gcc-final: Do mpfr, gmp, and mpc, too

Due to removal of MPFR, GMP, and MPC steps now gcc-final needs to unpack
them, too.

Location:

BOOK/cross-tools

Files:

• arm/gcc-final.xml (modified) (2 diffs)
• common/gcc-final.xml (modified) (1 diff)
• mips/gcc-final.xml (modified) (2 diffs)
• x86/gcc-final.xml (modified) (2 diffs)

BOOK/cross-tools/arm/gcc-final.xml

@@ -27 +27 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
@@ -46 +54 @@
   --with-sysroot=${CLFS} --disable-nls --enable-shared \
   --enable-languages=c --enable-c99 --enable-long-long \
-  --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \
-  --with-mpc=${CLFS}/cross-tools --disable-multilib \
+  --disable-multilib \
   --with-abi=${CLFS_ABI} --with-arch=${CLFS_ARM_ARCH} \
   --with-mode=${CLFS_ARM_MODE} --with-float=${CLFS_FLOAT} \

BOOK/cross-tools/common/gcc-final.xml

@@ -24 +24 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <para os="b">GCC requires the GMP, MPFR, and MPC packages to either be
+    present on the host or to be present in source form within the gcc source
+    tree.  Unpack these into the GCC directory after unpacking GCC:</para>
+
+<screen os="ba"><userinput>tar xf ../mpfr-&mpfr-version;.tar.bz2
+mv -v mpfr-&mpfr-version; mpfr
+tar xf ../gmp-&gmp-version;.tar.bz2
+mv -v gmp-&gmp-version; gmp
+tar xf ../mpc-&mpc-version;.tar.gz
+mv -v mpc-&mpc-version; mpc</userinput></screen>
 
     <xi:include os="c" xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/mips/gcc-final.xml

@@ -27 +27 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
@@ -46 +54 @@
   --with-sysroot=${CLFS} --disable-nls --enable-shared \
   --enable-languages=c --enable-c99 --enable-long-long \
-  --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \
-  --with-mpc=${CLFS}/cross-tools --disable-multilib \
+  --disable-multilib \
   --with-abi=${CLFS_ABI} --with-arch=mips${CLFS_MIPS_LEVEL} \
   --with-float=${CLFS_FLOAT} --with-endian=${CLFS_ENDIAN}</userinput></screen>

BOOK/cross-tools/x86/gcc-final.xml

@@ -27 +27 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
@@ -46 +54 @@
   --with-sysroot=${CLFS} --disable-nls --enable-shared \
   --enable-languages=c --enable-c99 --enable-long-long \
-  --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \
-  --with-mpc=${CLFS}/cross-tools --disable-multilib \
+  --disable-multilib \
   --with-arch=${CLFS_CPU}</userinput></screen>