version up : gcc-4.7.4. add gcc-fortran target by Marco.

drop gcc-multiarch.patch that is no longer needed. add ppl-0.11-gcc-4.9.patch to compile with gcc-4.9.

version up : gcc-4.7.4. add gcc-fortran target by Marco.
drop gcc-multiarch.patch that is no longer needed. add ppl-0.11-gcc-4.9.patch to compile with gcc-4.9.
9e179c0c · Kazuhiko Shiozaki · a9172578 · 9e179c0c · a9172578 · 9e179c0c
Commit 9e179c0c authored Aug 21, 2014 by Kazuhiko Shiozaki
3 changed files
--- a/component/gcc/buildout.cfg
+++ b/component/gcc/buildout.cfg
@@ -32,69 +32,81 @@ environment =

 [ppl]
 recipe = slapos.recipe.cmmi
-# we should use version 0.10.x for gcc-4.5
-url = http://bugseng.com/products/ppl/download/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2
-md5sum = 5667111f53150618b0fa522ffc53fc3e
+# we should use version 0.11.x for gcc-4.7
+url = http://bugseng.com/external/ppl/download/ftp/releases/0.11/ppl-0.11.tar.bz2
+md5sum = c414abd2ecaf1f1f48949c78d383ee1a
+patches =
+  ${:_profile_base_location_}/ppl-0.11-gcc-4.9.patch#09e00eefba5f8e6e77a9c9c611fccc64
+
 configure-options =
-  --with-libgmp-prefix=${gmp-4:location}
-  --with-libgmpxx-prefix=${gmp-4:location}
+  --with-gmp=${gmp-4:location}
+  --with-gmp-prefix=${gmp-4:location}
  --disable-static
 environment =
  PATH=${m4:location}/bin:%(PATH)s
  LDFLAGS=-Wl,-rpath=${gmp-4:location}/lib
+  CXXFLAGS=-fpermissive
+

 [cloog-ppl]
 recipe = slapos.recipe.cmmi
-url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.9.tar.gz
-md5sum = 806e001d1b1a6b130069ff6274900af5
+url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-0.16.1.tar.gz
+md5sum = 947123350d1ff6dcb4b0774947ac015a
 configure-options =
-  --with-gmp=${gmp-4:location}
+  --with-gmp-prefix=${gmp-4:location}
  --with-ppl=${ppl:location}
  --disable-static
 environment =
  PATH=${m4:location}/bin:%(PATH)s
  LDFLAGS=-Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${ppl:location}/lib

-[gcc]
+[gcc-common]
 recipe = slapos.recipe.cmmi
-url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2
-md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
-patches =
-  ${:_profile_base_location_}/gcc-multiarch.patch#819e6735270c8a432b0512b49f40219f
-patch-options = -p2
-configure-command = make clean \\; make distclean \\; ./configure
+url = http://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2
+md5sum = 4c696da46297de6ae77a82797d2abe28
+# make install does not work when several core are used
+make-targets = install -j1
+
+[gcc]
+<= gcc-common
 configure-options =
  --disable-bootstrap
-  --enable-languages="c,c++"
  --disable-multilib
  --with-gmp=${gmp-4:location}
  --with-mpfr=${mpfr:location}
  --with-mpc=${mpc:location}
+  --enable-languages="c,c++"
  --with-ppl=${ppl:location}
  --with-cloog=${cloog-ppl:location}
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --enable-cloog-backend=isl
 environment =
  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib
-# make install does not work when several core are used
-make-targets = install -j1

 [gcc-minimal]
-recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-core-4.5.4.tar.bz2
-md5sum = ca62e442629a9a7710f5d797bf1b521c
-patches =
-  ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
-patch-options = -p2
+<= gcc-common
 configure-options =
  --disable-bootstrap
-  --enable-languages=c
  --disable-multilib
  --with-gmp=${gmp-4:location}
  --with-mpfr=${mpfr:location}
  --with-mpc=${mpc:location}
+  --enable-languages=c
  --without-ppl
  --without-cloog
 environment =
  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${mpc:location}/lib
-# make install does not work when several core are used
-make-targets = install -j1
+
+[gcc-fortran]
+<= gcc-common
+configure-options =
+  --disable-bootstrap
+  --disable-multilib
+  --with-gmp=${gmp-4:location}
+  --with-mpfr=${mpfr:location}
+  --with-mpc=${mpc:location}
+  --enable-languages="c,c++,fortran"
+  --with-ppl=${ppl:location}
+  --with-cloog=${cloog-ppl:location}
+  --enable-cloog-backend=isl
+environment =
+  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib
--- a/component/gcc/gcc-multiarch.patch
+++ b/component/gcc/gcc-multiarch.patch
--- a/component/gcc/ppl-0.11-gcc-4.9.patch
+++ b/component/gcc/ppl-0.11-gcc-4.9.patch
+# HG changeset patch
+# User Bernhard Walle <bernhard@bwalle.de>
+# Date 1399806036 -7200
+#      Sun May 11 13:00:36 2014 +0200
+# Node ID 5632a171e7c1dc4c0fb5c7a8352afb4188cd29d5
+# Parent  e35fa03cd2043496839aa5fa3a1a3d2d375b5535
+complibs/ppl: Fix build of ppl 0.11.2 with gcc 4.9
+
+  From: Roberto Bagnara <bagnara@cs.unipr.it>
+  Date: Tue, 29 Apr 2014 19:51:43 +0000 (+0200)
+  Subject: Added missing inclusions.  Use std::ptrdiff_t.
+  X-Git-Url: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl%2Fppl.git;a=commitdiff_plain;h=61d4e14dfd9f1121e9b4521dead5728b2424dd7c
+
+  Added missing inclusions.  Use std::ptrdiff_t.
+  (Thanks to Paulo Cesar Pereira de Andrade.)
+
+Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
+
+diff -r e35fa03cd204 -r 5632a171e7c1 patches/ppl/0.11.2/500-ptrdiff_t.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ppl/0.11.2/500-ptrdiff_t.patch	Sun May 11 13:00:36 2014 +0200
+@@ -0,0 +1,95 @@
+From: Bernhard Walle <bernhard@bwalle.de>
+Subject: Fix compilation with gcc 4.9 (ptrdiff_t errors)
+
+This is a backport of following patch in ppl git
+
+  commit 61d4e14dfd9f1121e9b4521dead5728b2424dd7c
+  Author: Roberto Bagnara <bagnara@cs.unipr.it>
+  Date:   Tue Apr 29 21:51:43 2014 +0200
+
+      Added missing inclusions.  Use std::ptrdiff_t.
+      (Thanks to Paulo Cesar Pereira de Andrade.)
+
+---
+ src/Congruence_System.defs.hh     |    3 ++-
+ src/Constraint_System.defs.hh     |    3 ++-
+ src/Generator_System.defs.hh      |    3 ++-
+ src/Grid_Generator_System.defs.hh |    3 ++-
+ 4 files changed, 8 insertions(+), 4 deletions(-)
+
+--- a/src/Grid_Generator_System.defs.hh
++++ b/src/Grid_Generator_System.defs.hh
+@@ -30,6 +30,7 @@ site: http://www.cs.unipr.it/ppl/ . */
+ #include "Variables_Set.types.hh"
+ #include "Grid.types.hh"
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -267,7 +268,7 @@ public:
+   class const_iterator
+     : public std::iterator<std::forward_iterator_tag,
+ 			   Grid_Generator,
+-			   ptrdiff_t,
++			   std::ptrdiff_t,
+ 			   const Grid_Generator*,
+ 			   const Grid_Generator&>,
+       private Generator_System::const_iterator {
+--- a/src/Congruence_System.defs.hh
++++ b/src/Congruence_System.defs.hh
+@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
+ #include "Grid.types.hh"
+ #include "Grid_Certificate.types.hh"
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -235,7 +236,7 @@ public:
+   class const_iterator
+     : public std::iterator<std::forward_iterator_tag,
+ 			   Congruence,
+-			   ptrdiff_t,
++			   std::ptrdiff_t,
+ 			   const Congruence*,
+ 			   const Congruence&> {
+   public:
+--- a/src/Constraint_System.defs.hh
++++ b/src/Constraint_System.defs.hh
+@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
+ #include "Congruence_System.types.hh"
+ #include <iterator>
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -204,7 +205,7 @@ public:
+   class const_iterator
+     : public std::iterator<std::forward_iterator_tag,
+ 			   Constraint,
+-			   ptrdiff_t,
++			   std::ptrdiff_t,
+ 			   const Constraint*,
+ 			   const Constraint&> {
+   public:
+--- a/src/Generator_System.defs.hh
++++ b/src/Generator_System.defs.hh
+@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
+ #include "Polyhedron.types.hh"
+ #include "Poly_Con_Relation.defs.hh"
+ #include <iosfwd>
++#include <cstddef>
+ 
+ namespace Parma_Polyhedra_Library {
+ 
+@@ -250,7 +251,7 @@ public:
+   class const_iterator
+     : public std::iterator<std::forward_iterator_tag,
+ 			   Generator,
+-			   ptrdiff_t,
++			   std::ptrdiff_t,
+ 			   const Generator*,
+ 			   const Generator&> {
+   public: