Changeset e81afa2 for BOOK/temp-system

Timestamp:

Jul 25, 2010, 3:23:40 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

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

Children:

54d2269

Parents:

134074b

Message:

Downgraded PPL to 0.10.2, GCC incompatible with 0.11pre24. Also clean up Cloog-PPL and remove a sed to make it work with 0.11.

Location:

BOOK/temp-system

Files:

• 64/ppl.xml (modified) (2 diffs)
• common/cloog-ppl.xml (modified) (1 diff)
• common/ppl.xml (modified) (1 diff)
• multilib/ppl.xml (modified) (2 diffs)

BOOK/temp-system/64/ppl.xml

@@ -23 +23 @@
     <title>Installation of PPL</title>
 
-<!--
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ppl.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ppl.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
- -->
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -42 +40 @@
     --disable-optimization --with-libgmp-prefix=/tools \
     --with-libgmpxx-prefix=/tools</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='bp1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='bp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/common/cloog-ppl.xml

@@ -33 +33 @@
 -->
 
-    <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. Also, Have the configure script look for the version of PPL that we compiled in the previous step:</para>
+    <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" \
-    -e "s/^\(ppl_minor_version\)=.[0-9]/\1=11/" \
     configure.orig &gt; configure</userinput></screen>
 

BOOK/temp-system/common/ppl.xml

@@ -23 +23 @@
     <title>Installation of PPL</title>
 
-<!--
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/ppl.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/ppl.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <para os="a">Prepare PPL for compilation:</para>

BOOK/temp-system/multilib/ppl.xml

@@ -23 +23 @@
     <title>Installation of PPL</title>
 
-<!--
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ppl.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ppl.xml"
-        xpointer="xpointer(//*[@os='p2'])"/>
- -->
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -42 +40 @@
     --disable-optimization --with-libgmp-prefix=/tools \
     --with-libgmpxx-prefix=/tools</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='bp1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='bp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"