Changeset 35e7499 for BOOK/temp-system/multilib

Timestamp:

Feb 26, 2012, 9:50:35 AM (13 years ago)

Author:

Jonathan Norman <jon@…>

Branches:

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

Children:

5b6948a

Parents:

0fadcfd (diff), 68fb4f2 (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:

Merged with Cosmo-branch, renamed / rediffed patches as required and fixed download links

Location:

BOOK/temp-system/multilib

Files:

• binutils.xml (modified) (1 diff)
• cloog.xml (moved) (moved from BOOK/temp-system/multilib/cloog-ppl.xml ) (2 diffs)
• gcc.xml (modified) (3 diffs)

BOOK/temp-system/multilib/binutils.xml

@@ -38 +38 @@
     --prefix=/tools --libdir=/tools/lib64 --with-lib-path=/tools/lib64:/tools/lib \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
+    --disable-nls --enable-shared --enable-64-bit-bfd \
+    --with-ppl=/tools --with-cloog=/tools --enable-cloog-backend=isl</userinput></screen>
 
     <variablelist os="ea">

BOOK/temp-system/multilib/cloog.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-temp-system-cloog-ppl" role="wrap">
-  <?dbhtml filename="cloog-ppl.html"?>
+<sect1 id="ch-temp-system-cloog" role="wrap">
+  <?dbhtml filename="cloog.html"?>
 
-  <title>CLooG-PPL-&cloog-ppl-version;</title>
+  <title>CLooG-&cloog-version;</title>
 
-  <indexterm zone="ch-temp-system-cloog-ppl">
-    <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
+  <indexterm zone="ch-temp-system-cloog">
+    <primary sortas="a-CLooG">CLooG</primary>
     <secondary>temporary system</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/cloog-ppl.xml"
+  href="../../final-system/common/cloog.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of CLooG-PPL</title>
+    <title>Installation of CLooG</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
         xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
-    --libdir=/tools/lib64 --enable-shared \
-    --with-gmp=/tools --with-ppl=/tools</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64 \
+     --enable-shared --with-gmp-prefix=/tools </userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='d'])"/>
         
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
@@ -62 +61 @@
 
     <para>Details on this package are located in <xref
-    linkend="contents-cloog-ppl" role="."/></para>
+    linkend="contents-cloog" role="."/></para>
 
   </sect2>

BOOK/temp-system/multilib/gcc.xml

@@ -23 +23 @@
     <title>Installation of GCC</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29 +29 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/> -->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -77 +77 @@
   --enable-c99 --enable-shared --enable-threads=posix \
   --enable-__cxa_atexit --disable-nls --enable-languages=c,c++ \
-  --disable-libstdcxx-pch</userinput></screen>
+  --disable-libstdcxx-pch --enable-cloog-backend=isl</userinput></screen>
 
     <variablelist os="dd">