Changeset afc74a1

Timestamp:

Jun 3, 2013, 12:54:49 PM (12 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

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

Children:

fa72b0b7

Parents:

ab0d03b

Message:

Update ClooG to 0.18.0.

Location:

BOOK

Files:

• cross-tools/common/cloog.xml (modified) (1 diff)
• temp-system/64/cloog.xml (modified) (1 diff)
• temp-system/common/cloog.xml (modified) (2 diffs)
• temp-system/multilib/cloog.xml (modified) (1 diff)

BOOK/cross-tools/common/cloog.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of CLooG</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../temp-system/common/cloog.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../temp-system/common/cloog.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <para os="a">Prepare CLooG for compilation:</para>

BOOK/temp-system/64/cloog.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of CLooG</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    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"

BOOK/temp-system/common/cloog.xml

@@ -23 +23 @@
     <title>Installation of CLooG</title>
 
-    <para os="s1">The following prevents the configure script from setting <envar>LD_LIBRARY_PATH</envar> when it finds PPL. This will prevent any conflicts with libraries from the host system:</para>
-
-<screen os="s2"><userinput>cp -v configure{,.orig}
-sed -e "/LD_LIBRARY_PATH=/d" \
-    configure.orig &gt; configure</userinput></screen>
-
     <para os="a">Prepare CLooG for compilation:</para>
 
@@ -37 +31 @@
     <para os="c">Compile the package:</para>
 
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="d"><userinput>make -C isl 
+make -C isl install
+make</userinput></screen>
 
     <para os="e">Install the package:</para>

BOOK/temp-system/multilib/cloog.xml

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     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='a'])"/>
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64 \
-     --enable-shared --with-gmp-prefix=/tools </userinput></screen>
+     --enable-shared --with-gmp-prefix=/tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"