Changeset 229ed25 for BOOK/final-system/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/final-system/common/cloog.xml (moved) (moved from BOOK/final-system/common/cloog-ppl.xml ) (8 diffs)

BOOK/final-system/common/cloog.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-cloog-ppl" role="wrap">
-  <?dbhtml filename="cloog-ppl.html"?>
+<sect1 id="ch-system-cloog" role="wrap">
+  <?dbhtml filename="cloog.html"?>
 
-  <title>CLooG-PPL-&cloog-ppl-version;</title>
+  <title>CLooG-&cloog-version;</title>
 
-  <indexterm zone="ch-system-cloog-ppl">
-    <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
+  <indexterm zone="ch-system-cloog">
+    <primary sortas="a-CLooG">CLooG</primary>
   </indexterm>
 
@@ -18 +18 @@
     <title/>
 
-    <para>CLooG-PPL is a library to generate code for scanning Z-polyhedra.
+    <para>CLooG is a library to generate code for scanning Z-polyhedra.
     In other words, it finds code that reaches each integral point of one or
     more parameterized polyhedra.  GCC links with this library in order to
@@ -26 +26 @@
 
   <sect2 role="installation">
-    <title>Installation of CLooG-PPL</title>
+    <title>Installation of CLooG</title>
 
-    <para os="a">Prepare CLooG-PPL for compilation:</para>
+    <para os="a">Prepare CLooG for compilation:</para>
 
 <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>
+  ./configure --prefix=/usr --enable-shared --with-isl=system</userinput></screen>
+
+    <para os="s1">Apply a <command>sed</command> which prevents the attempted installation of an invalid file:</para>
+
+<screen os="s2"><userinput>sed -i '/cmake/d' Makefile</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -40 +43 @@
 
     <important os="e">
-      <para>The test suite for CLooG-PPL is considered
+      <para>The test suite for CLooG is considered
       critical. Do not skip it under any circumstance.</para>
     </important>
@@ -46 +49 @@
     <para os="f">Test the results:</para>
 
-<screen os="g"><userinput>make check</userinput></screen>
+<screen os="g"><userinput remap="test">make check</userinput></screen>
 
     <para os="h">Install the package:</para>
@@ -54 +57 @@
   </sect2>
 
-  <sect2 id="contents-cloog-ppl" role="content">
-    <title>Contents of CLooG-PPL</title>
+  <sect2 id="contents-cloog" role="content">
+    <title>Contents of CLooG</title>
 
     <segmentedlist>
-      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed program</segtitle>
       <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>cloog</seg>
-        <seg>libcloog.[a,so]</seg>
+        <seg>libcloog-isl.[a,so]</seg>
         <seg>/usr/include/cloog</seg>
       </seglistitem>
@@ -78 +81 @@
         <listitem>
           <para>Loop generator for scanning Z-polyhedra</para>
-          <indexterm zone="ch-system-cloog-ppl cloog">
+          <indexterm zone="ch-system-cloog cloog">
             <primary sortas="b-cloog">cloog</primary>
           </indexterm>
@@ -84 +87 @@
       </varlistentry>
 
-      <varlistentry id="libcloog">
-        <term><filename class="libraryfile">libcloog</filename></term>
+      <varlistentry id="libcloog-isl">
+        <term><filename class="libraryfile">libcloog-isl</filename></term>
         <listitem>
-          <para>The Chunky Loop Generator.</para>
-          <indexterm zone="ch-system-cloog-ppl libcloog">
-            <primary sortas="c-libcloog-ppl">libcloog</primary>
+          <para>Isl backend for CLooG.</para>
+          <indexterm zone="ch-system-cloog libcloog-isl">
+            <primary sortas="c-libcloog-isl">libcloog-isl</primary>
           </indexterm>
         </listitem>