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

BOOK/final-system/multilib/cloog.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-ppl-32" role="wrap">
-  <?dbhtml filename="ppl.html"?>
+<sect1 id="ch-system-cloog-32" role="wrap">
+  <?dbhtml filename="cloog.html"?>
 
-  <title>PPL-&ppl-version; 32 Bit Libraries</title>
+  <title>CLooG-&cloog-version; 32 Bit Libraries</title>
 
-  <indexterm zone="ch-system-ppl-32">
-    <primary sortas="a-PPL">PPL</primary>
+  <indexterm zone="ch-system-cloog-32">
+    <primary sortas="a-CLooG">CLooG</primary>
     <secondary>32 Bit</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/ppl.xml"
+  href="../common/cloog.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of PPL</title>
+    <title>Installation of CLooG</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD32}" \
-CXX="g++ -isystem /usr/include ${BUILD32}" \
+<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 --disable-optimization</userinput></screen>
+  ./configure --prefix=/usr \
+    --host=${CLFS_TARGET32} --enable-shared --with-isl=system</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/cloog.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/cloog.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ppl.xml"
+    href="../common/cloog.xml"
     xpointer="xpointer(//*[@os='i'])"/>
-
-    <para os="m1">Prepare <filename>ppl-config</filename> to be wrapped by
-    the multiarch wrapper:</para>
-
-<screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-32}</userinput></screen>
-
-    <para os="j">One of the headers installed by PPL is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of PPL. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
-
-<screen os="k"><userinput>mv -v /usr/include/ppl{,-32}.hh</userinput></screen>
-
 
   </sect2>
@@ -77 +74 @@
 
     <para>Details on this package are located in <xref
-    linkend="contents-ppl" role="."/></para>
+    linkend="contents-cloog" role="."/></para>
 
   </sect2>