public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GCC 4.4: Enable Graphite by building against PPL and GLooG.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16424
This commit is contained in:
Ludovic Courtès 2009-07-18 21:37:23 +00:00
parent 39efe36121
commit 34bd10567b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/gcc-4.4/default.nix
View File

@ -5,6 +5,7 @@
, staticCompiler ? false , staticCompiler ? false
, texinfo ? null , texinfo ? null
, gmp, mpfr, gettext , gmp, mpfr, gettext
, ppl ? null, cloogppl ? null # used by the Graphite optimization framework
, bison ? null, flex ? null , bison ? null, flex ? null
, zlib ? null, boehmgc ? null , zlib ? null, boehmgc ? null
, enableMultilib ? false , enableMultilib ? false
@ -68,6 +69,8 @@ stdenv.mkDerivation ({
inherit noSysDirs profiledCompiler staticCompiler; inherit noSysDirs profiledCompiler staticCompiler;
buildInputs = [ texinfo gmp mpfr gettext ] buildInputs = [ texinfo gmp mpfr gettext ]
++ (optional (ppl != null) ppl)
++ (optional (cloogppl != null) cloogppl)
++ (optionals langTreelang [bison flex]) ++ (optionals langTreelang [bison flex])
++ (optional (zlib != null) zlib) ++ (optional (zlib != null) zlib)
++ (optional (boehmgc != null) boehmgc) ++ (optional (boehmgc != null) boehmgc)
@ -75,6 +78,8 @@ stdenv.mkDerivation ({
configureFlags = " configureFlags = "
${if enableMultilib then "" else "--disable-multilib"} ${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 --disable-libstdcxx-pch
--without-included-gettext --without-included-gettext
--with-system-zlib --with-system-zlib

3
pkgs/top-level/all-packages.nix
View File

@ -1669,7 +1669,8 @@ let
})); }));
gcc44 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.4) { 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; profiledCompiler = true;
}); });