From 34bd10567ba7852ca9ce3b95b668e8a0f3bf3f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 18 Jul 2009 21:37:23 +0000
Subject: [PATCH] GCC 4.4: Enable Graphite by building against PPL and GLooG.

svn path=/nixpkgs/trunk/; revision=16424
---
 pkgs/development/compilers/gcc-4.4/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix                | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix
index 2b26b9b01a3..f55f62a9fa6 100644
--- a/pkgs/development/compilers/gcc-4.4/default.nix
+++ b/pkgs/development/compilers/gcc-4.4/default.nix
@@ -5,6 +5,7 @@
 , staticCompiler ? false
 , texinfo ? null
 , gmp, mpfr, gettext
+, ppl ? null, cloogppl ? null  # used by the Graphite optimization framework
 , bison ? null, flex ? null
 , zlib ? null, boehmgc ? null
 , enableMultilib ? false
@@ -68,6 +69,8 @@ stdenv.mkDerivation ({
   inherit noSysDirs profiledCompiler staticCompiler;
 
   buildInputs = [ texinfo gmp mpfr gettext ]
+    ++ (optional (ppl != null) ppl)
+    ++ (optional (cloogppl != null) cloogppl)
     ++ (optionals langTreelang [bison flex])
     ++ (optional (zlib != null) zlib)
     ++ (optional (boehmgc != null) boehmgc)
@@ -75,6 +78,8 @@ stdenv.mkDerivation ({
 
   configureFlags = "
     ${if enableMultilib then "" else "--disable-multilib"}
+    ${if ppl != null then "--with-ppl=${ppl}" else ""}
+    ${if cloogppl != null then "--with-cloog=${cloogppl}" else ""}
     --disable-libstdcxx-pch
     --without-included-gettext
     --with-system-zlib
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c3089fdd85..cfafffe7aba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1669,7 +1669,8 @@ let
   }));
 
   gcc44 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.4) {
-    inherit fetchurl stdenv texinfo gmp mpfr gettext noSysDirs;
+    inherit fetchurl stdenv texinfo gmp mpfr ppl cloogppl
+      gettext noSysDirs;
     profiledCompiler = true;
   });