Changeset 03e6a40 for BOOK/final-system/common/cloog.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/final-system/common/cloog.xml (modified) (1 diff)

BOOK/final-system/common/cloog.xml

@@ -33 +33 @@
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
   ./configure --prefix=/usr --enable-shared --with-isl=system</userinput></screen>
+
+    <para os="s1">Apply a <command>sed</command> which prevents the attempted installation of an invalid file:</para>
+
+<screen os="s2"><userinput>sed -i '/cmake/d' Makefile</userinput></screen>
 
     <para os="c">Compile the package:</para>