Changeset 6cefbfb for BOOK/final-system/common

Timestamp:

Apr 16, 2011, 2:36:23 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

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

Children:

21e442f

Parents:

8c3f58f (diff), af891d2 (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/introduction/common/changelog.xml
BOOK/packages.ent

Location:

BOOK/final-system/common

Files:

• cloog-ppl.xml (modified) (1 diff)
• mpc.xml (modified) (1 diff)
• ppl.xml (modified) (1 diff)

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

@@ -27 +27 @@
   <sect2 role="installation">
     <title>Installation of CLooG-PPL</title>
-
-    <para os="p1">When this version of CLooG-PPL was packaged it was missing
-    a few files related to Libtool. The following patch adds them back in and
-    regenerted Automake and Autoconf.</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&cloog-ppl-autogen-patch;</userinput></screen>
 
     <para os="a">Prepare CLooG-PPL for compilation:</para>

BOOK/final-system/common/mpc.xml

@@ -29 +29 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" \
-LDFLAGS="-Wl,-rpath-link,/lib" \
+LDFLAGS="-Wl,-rpath-link,/lib" EGREP="grep -E" \
 ./configure --prefix=/usr</userinput></screen>
 

BOOK/final-system/common/ppl.xml

@@ -26 +26 @@
   <sect2 role="installation">
     <title>Installation of PPL</title>
-
-    <para os="s1">The following fixes an issue when detecting newer versions
-    of GMP.</para>
-
-<screen os="s2"><userinput>sed -i "s/__GMP_BITS_PER_MP_LIMB/GMP_LIMB_BITS/g" configure</userinput></screen>
 
     <para os="a">Prepare PPL for compilation:</para>