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

gcc-4.{4,5,6}: Remove Treelang, bison, and flex

Browse Source 
Treelang was dropped in gcc 4.4 and bison and flex are not needed for anything else

svn path=/nixpkgs/branches/stdenv-updates/; revision=28858
This commit is contained in:
Shea Levy 2011-08-28 18:41:51 +00:00
parent b65578c776
commit d11c7b604f
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, noSysDirs { stdenv, fetchurl, noSysDirs
, langC ? true, langCC ? true, langFortran ? false, langTreelang ? false , langC ? true, langCC ? true, langFortran ? false
, langJava ? false , langJava ? false
, langAda ? false , langAda ? false
, langVhdl ? false , langVhdl ? false
@ -9,7 +9,6 @@
, texinfo ? null , texinfo ? null
, gmp, mpfr, gettext, which , gmp, mpfr, gettext, which
, ppl ? null, cloogppl ? null # used by the Graphite optimization framework , ppl ? null, cloogppl ? null # used by the Graphite optimization framework
, bison ? null, flex ? null
, zlib ? null, boehmgc ? null , zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
@ -25,7 +24,6 @@
, gnat ? null , gnat ? null
}: }:
assert langTreelang -> bison != null && flex != null;
assert langJava -> zip != null && unzip != null assert langJava -> zip != null && unzip != null
&& zlib != null && boehmgc != null; && zlib != null && boehmgc != null;
assert langAda -> gnatboot != null; assert langAda -> gnatboot != null;
@ -131,7 +129,6 @@ stdenv.mkDerivation ({
buildInputs = [ gmp mpfr gettext ] buildInputs = [ gmp mpfr gettext ]
++ (optional (ppl != null) ppl) ++ (optional (ppl != null) ppl)
++ (optional (cloogppl != null) cloogppl) ++ (optional (cloogppl != null) cloogppl)
++ (optionals langTreelang [bison flex])
++ (optional (zlib != null) zlib) ++ (optional (zlib != null) zlib)
++ (optional (boehmgc != null) boehmgc) ++ (optional (boehmgc != null) boehmgc)
++ (optionals langJava [zip unzip]) ++ (optionals langJava [zip unzip])
@ -160,7 +157,6 @@ stdenv.mkDerivation ({
++ optional langCC "c++" ++ optional langCC "c++"
++ optional langFortran "fortran" ++ optional langFortran "fortran"
++ optional langJava "java" ++ optional langJava "java"
++ optional langTreelang "treelang"
++ optional langAda "ada" ++ optional langAda "ada"
++ optional langVhdl "vhdl" ++ optional langVhdl "vhdl"
) )
@ -209,7 +205,6 @@ stdenv.mkDerivation ({
++ optional langCC "c++" ++ optional langCC "c++"
++ optional langFortran "fortran" ++ optional langFortran "fortran"
++ optional langJava "java" ++ optional langJava "java"
++ optional langTreelang "treelang"
++ optional langAda "ada" ++ optional langAda "ada"
++ optional langVhdl "vhdl" ++ optional langVhdl "vhdl"
) )
@ -244,7 +239,7 @@ stdenv.mkDerivation ({
++ optionals javaAwtGtk [ gmp mpfr ]))); ++ optionals javaAwtGtk [ gmp mpfr ])));
passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl passthru = { inherit langC langCC langAda langFortran langVhdl
enableMultilib version; }; enableMultilib version; };
# ghdl does not build fine with parallel building # ghdl does not build fine with parallel building

9
pkgs/development/compilers/gcc-4.5/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, noSysDirs { stdenv, fetchurl, noSysDirs
, langC ? true, langCC ? true, langFortran ? false, langTreelang ? false , langC ? true, langCC ? true, langFortran ? false
, langJava ? false , langJava ? false
, langAda ? false , langAda ? false
, langVhdl ? false , langVhdl ? false
@ -11,7 +11,6 @@
, gmp, mpfr, mpc, gettext, which , gmp, mpfr, mpc, gettext, which
, libelf # optional, for link-time optimizations (LTO) , libelf # optional, for link-time optimizations (LTO)
, ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework , ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework
, bison ? null, flex ? null
, zlib ? null, boehmgc ? null , zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
@ -29,7 +28,6 @@
, stripped ? true , stripped ? true
}: }:
assert langTreelang -> bison != null && flex != null;
assert langJava -> zip != null && unzip != null assert langJava -> zip != null && unzip != null
&& zlib != null && boehmgc != null && zlib != null && boehmgc != null
&& perl != null; # for `--enable-java-home' && perl != null; # for `--enable-java-home'
@ -203,7 +201,6 @@ stdenv.mkDerivation ({
buildInputs = [ gmp mpfr mpc libelf gettext ] buildInputs = [ gmp mpfr mpc libelf gettext ]
++ (optional (ppl != null) ppl) ++ (optional (ppl != null) ppl)
++ (optional (cloogppl != null) cloogppl) ++ (optional (cloogppl != null) cloogppl)
++ (optionals langTreelang [bison flex])
++ (optional (zlib != null) zlib) ++ (optional (zlib != null) zlib)
++ (optional (boehmgc != null) boehmgc) ++ (optional (boehmgc != null) boehmgc)
++ (optionals langJava [zip unzip]) ++ (optionals langJava [zip unzip])
@ -245,7 +242,6 @@ stdenv.mkDerivation ({
++ optional langCC "c++" ++ optional langCC "c++"
++ optional langFortran "fortran" ++ optional langFortran "fortran"
++ optional langJava "java" ++ optional langJava "java"
++ optional langTreelang "treelang"
++ optional langAda "ada" ++ optional langAda "ada"
++ optional langVhdl "vhdl" ++ optional langVhdl "vhdl"
) )
@ -292,7 +288,6 @@ stdenv.mkDerivation ({
++ optional langCC "c++" ++ optional langCC "c++"
++ optional langFortran "fortran" ++ optional langFortran "fortran"
++ optional langJava "java" ++ optional langJava "java"
++ optional langTreelang "treelang"
++ optional langAda "ada" ++ optional langAda "ada"
++ optional langVhdl "vhdl" ++ optional langVhdl "vhdl"
) )
@ -357,7 +352,7 @@ stdenv.mkDerivation ({
" -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}") " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
else null; else null;
passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl passthru = { inherit langC langCC langAda langFortran langVhdl
enableMultilib version; }; enableMultilib version; };
enableParallelBuilding = true; enableParallelBuilding = true;

9
pkgs/development/compilers/gcc-4.6/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, noSysDirs { stdenv, fetchurl, noSysDirs
, langC ? true, langCC ? true, langFortran ? false, langTreelang ? false , langC ? true, langCC ? true, langFortran ? false
, langJava ? false , langJava ? false
, langAda ? false , langAda ? false
, langVhdl ? false , langVhdl ? false
@ -12,7 +12,6 @@
, gmp, mpfr, mpc, gettext, which , gmp, mpfr, mpc, gettext, which
, libelf # optional, for link-time optimizations (LTO) , libelf # optional, for link-time optimizations (LTO)
, ppl ? null, cloogppl ? null, cloog ? null # optional, for the Graphite optimization framework. Cannot pass both cloog and cloogppl , ppl ? null, cloogppl ? null, cloog ? null # optional, for the Graphite optimization framework. Cannot pass both cloog and cloogppl
, bison ? null, flex ? null
, zlib ? null, boehmgc ? null , zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null , zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
@ -30,7 +29,6 @@
, stripped ? true , stripped ? true
}: }:
assert langTreelang -> bison != null && flex != null;
assert langJava -> zip != null && unzip != null assert langJava -> zip != null && unzip != null
&& zlib != null && boehmgc != null && zlib != null && boehmgc != null
&& perl != null; # for `--enable-java-home' && perl != null; # for `--enable-java-home'
@ -209,7 +207,6 @@ stdenv.mkDerivation ({
++ (optional (ppl != null) ppl) ++ (optional (ppl != null) ppl)
++ (optional (cloogppl != null) cloogppl) ++ (optional (cloogppl != null) cloogppl)
++ (optional (cloog != null) cloog) ++ (optional (cloog != null) cloog)
++ (optionals langTreelang [bison flex])
++ (optional (zlib != null) zlib) ++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs) ++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs)
@ -252,7 +249,6 @@ stdenv.mkDerivation ({
++ optional langCC "c++" ++ optional langCC "c++"
++ optional langFortran "fortran" ++ optional langFortran "fortran"
++ optional langJava "java" ++ optional langJava "java"
++ optional langTreelang "treelang"
++ optional langAda "ada" ++ optional langAda "ada"
++ optional langVhdl "vhdl" ++ optional langVhdl "vhdl"
++ optional langGo "go" ++ optional langGo "go"
@ -306,7 +302,6 @@ stdenv.mkDerivation ({
++ optional langCC "c++" ++ optional langCC "c++"
++ optional langFortran "fortran" ++ optional langFortran "fortran"
++ optional langJava "java" ++ optional langJava "java"
++ optional langTreelang "treelang"
++ optional langAda "ada" ++ optional langAda "ada"
++ optional langVhdl "vhdl" ++ optional langVhdl "vhdl"
++ optional langGo "go" ++ optional langGo "go"
@ -372,7 +367,7 @@ stdenv.mkDerivation ({
" -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}") " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
else null; else null;
passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl passthru = { inherit langC langCC langAda langFortran langVhdl
langGo enableMultilib version; }; langGo enableMultilib version; };
enableParallelBuilding = true; enableParallelBuilding = true;