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

BOOK/final-system/multilib/isl.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-cloog-ppl-32" role="wrap">
-  <?dbhtml filename="cloog-ppl.html"?>
+<sect1 id="ch-system-isl-32" role="wrap">
+  <?dbhtml filename="isl.html"?>
 
-  <title>CLooG-PPL-&cloog-ppl-version; 32 Bit Libraries</title>
+  <title>ISL-&isl-version; 32 Bit Libraries</title>
 
-  <indexterm zone="ch-system-cloog-ppl-32">
-    <primary sortas="a-CLooG-PPL">CLooG-PPL</primary>
+  <indexterm zone="ch-system-isl-32">
+    <primary sortas="a-ISL">ISL</primary>
     <secondary>32 Bit</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/cloog-ppl.xml"
+  href="../common/isl.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of CLooG-PPL</title>
+    <title>Installation of ISL</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <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 \
-    --with-gmp --with-ppl</userinput></screen>
+  ./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog-ppl.xml"
+    href="../common/isl.xml"
     xpointer="xpointer(//*[@os='i'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/isl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/isl.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
   </sect2>
@@ -67 +73 @@
 
     <para>Details on this package are located in <xref
-    linkend="contents-cloog-ppl" role="."/></para>
+    linkend="contents-isl" role="."/></para>
 
   </sect2>