Changeset 6fcaede for BOOK/final-system/common

Timestamp:

Jul 7, 2009, 8:49:42 AM (16 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

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

Children:

b26d64d

Parents:

4261659 (diff), 53750600 (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' of git@…:cross-lfs

Location:

BOOK/final-system/common

Files:

• cloog-ppl.xml (modified) (1 diff)
• iproute2.xml (modified) (3 diffs)
• ppl.xml (modified) (1 diff)

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

@@ -32 +32 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
-    ./configure --prefix=/usr --enable-shared --with-gmp=/usr \
-        --with-ppl=/usr</userinput></screen>
+    ./configure --prefix=/usr --enable-shared --with-gmp \
+    --with-ppl</userinput></screen>
 
     <para os="c">Compile the package:</para>

BOOK/final-system/common/iproute2.xml

@@ -38 +38 @@
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make DESTDIR=/ DOCDIR=/usr/share/doc/iproute2 \
+<screen os="b"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
     MANDIR=/usr/share/man</userinput></screen>
 
@@ -45 +45 @@
 
       <varlistentry>
-        <term><parameter>DESTDIR=/</parameter></term>
+        <term><parameter>DESTDIR=</parameter></term>
         <listitem>
           <para>This option overrides the default DESTDIR of /usr, so that
@@ -69 +69 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DOCDIR=/usr/share/doc/iproute2 \
+<screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
     MANDIR=/usr/share/man install</userinput></screen>
 

BOOK/final-system/common/ppl.xml

@@ -30 +30 @@
     <para os="a">Prepare PPL for compilation:</para>
 
-<screen os="b"><userinput>CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
-    ./configure --prefix=/usr --enable-shared --with-libgmp-prefix=/usr \
-    --with-libgmpxx-prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include" \
+    CXX="g++ -isystem /usr/include" \
+    LDFLAGS="-Wl,-rpath-link,/lib" \
+    ./configure --prefix=/usr --enable-shared</userinput></screen>
 
     <para os="c">Compile the package:</para>