Changeset 229ed25 for BOOK/cross-tools/common/cloog.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/cross-tools/common/cloog.xml (moved) (moved from BOOK/cross-tools/common/cloog-ppl.xml ) (2 diffs)

BOOK/cross-tools/common/cloog.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-cross-tools-cloog-ppl" role="wrap">
-  <?dbhtml filename="cloog-ppl.html"?>
+<sect1 id="ch-cross-tools-cloog" role="wrap">
+  <?dbhtml filename="cloog.html"?>
 
-  <title>CLooG-PPL-&cloog-ppl-version;</title>
+  <title>CLooG-&cloog-version;</title>
 
-  <indexterm zone="ch-cross-tools-cloog-ppl">
-    <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
+  <indexterm zone="ch-cross-tools-cloog">
+    <primary sortas="a-CLooG">CLooG</primary>
     <secondary>cross-tools</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>
+
+    <para os="a">Prepare CLooG for compilation:</para>
+
+<screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+    ./configure --prefix=/cross-tools --disable-static \
+    --with-gmp-prefix=/cross-tools --with-isl-prefix=/cross-tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../temp-system/common/cloog-ppl.xml"
+    href="../../final-system/common/cloog.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../temp-system/common/cloog-ppl.xml"
+    href="../../final-system/common/cloog.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
-
-    <para os="a">Prepare CLooG-PPL for compilation:</para>
-
-<screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ./configure --prefix=/cross-tools --enable-shared --with-bits=gmp \
-    --with-gmp=/cross-tools --with-ppl=/cross-tools</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -51 +51 @@
 
     <para>Details on this package are located in <xref
-    linkend="contents-cloog-ppl" role="."/></para>
+    linkend="contents-cloog" role="."/></para>
 
   </sect2>