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

gcc: use texinfo4, fix bad mpfr reference

Browse Source
This commit is contained in:
Vladimír Čunát 2013-06-30 22:25:30 +02:00
parent 38477f5b0b
commit 2cf7a62f0c
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2101,12 +2101,14 @@ let
}); });
gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.3) { gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.3) {
inherit stdenv fetchurl texinfo gmp mpfr noSysDirs; inherit stdenv fetchurl gmp mpfr noSysDirs;
texinfo = texinfo4;
profiledCompiler = true; profiledCompiler = true;
})); }));
gcc43_realCross = makeOverridable (import ../development/compilers/gcc/4.3) { gcc43_realCross = makeOverridable (import ../development/compilers/gcc/4.3) {
inherit stdenv fetchurl texinfo gmp mpfr noSysDirs; inherit stdenv fetchurl gmp mpfr noSysDirs;
texinfo = texinfo4;
binutilsCross = binutilsCross; binutilsCross = binutilsCross;
libcCross = libcCross; libcCross = libcCross;
profiledCompiler = false; profiledCompiler = false;
@ -2117,8 +2119,9 @@ let
gcc44_realCross = lib.addMetaAttrs { platforms = []; } gcc44_realCross = lib.addMetaAttrs { platforms = []; }
(makeOverridable (import ../development/compilers/gcc/4.4) { (makeOverridable (import ../development/compilers/gcc/4.4) {
inherit stdenv fetchurl texinfo gmp mpfr /* ppl cloogppl */ noSysDirs inherit stdenv fetchurl gmp mpfr /* ppl cloogppl */ noSysDirs
gettext which; gettext which;
texinfo = texinfo4;
binutilsCross = binutilsCross; binutilsCross = binutilsCross;
libcCross = libcCross; libcCross = libcCross;
profiledCompiler = false; profiledCompiler = false;
@ -2137,8 +2140,9 @@ let
gcc45_realCross = lib.addMetaAttrs { platforms = []; } gcc45_realCross = lib.addMetaAttrs { platforms = []; }
(makeOverridable (import ../development/compilers/gcc/4.5) { (makeOverridable (import ../development/compilers/gcc/4.5) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib inherit fetchurl stdenv gmp mpfr mpc libelf zlib
ppl cloogppl gettext which noSysDirs; ppl cloogppl gettext which noSysDirs;
texinfo = texinfo4;
binutilsCross = binutilsCross; binutilsCross = binutilsCross;
libcCross = libcCross; libcCross = libcCross;
profiledCompiler = false; profiledCompiler = false;
@ -2225,15 +2229,17 @@ let
})); }));
gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.4) { gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.4) {
inherit fetchurl stdenv texinfo gmp mpfr /* ppl cloogppl */ inherit fetchurl stdenv gmp mpfr /* ppl cloogppl */
gettext which noSysDirs; gettext which noSysDirs;
texinfo = texinfo4;
profiledCompiler = true; profiledCompiler = true;
})); }));
gcc45_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.5) { gcc45_real = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.5) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl inherit fetchurl stdenv gmp mpfr mpc libelf zlib perl
ppl cloogppl ppl cloogppl
gettext which noSysDirs; gettext which noSysDirs;
texinfo = texinfo4;
# bootstrapping a profiled compiler does not work in the sheevaplug: # bootstrapping a profiled compiler does not work in the sheevaplug:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
profiledCompiler = !stdenv.isArm; profiledCompiler = !stdenv.isArm;
@ -2483,7 +2489,8 @@ let
}); });
ghdl = wrapGCC (import ../development/compilers/gcc/4.3 { ghdl = wrapGCC (import ../development/compilers/gcc/4.3 {
inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat; inherit stdenv fetchurl gmp mpfr noSysDirs gnat;
texinfo = texinfo4;
name = "ghdl"; name = "ghdl";
langVhdl = true; langVhdl = true;
langCC = false; langCC = false;
@ -2494,8 +2501,9 @@ let
# Not officially supported version for ghdl # Not officially supported version for ghdl
ghdl_gcc44 = lowPrio (wrapGCC (import ../development/compilers/gcc/4.4 { ghdl_gcc44 = lowPrio (wrapGCC (import ../development/compilers/gcc/4.4 {
inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat gettext which inherit stdenv fetchurl gmp mpfr noSysDirs gnat gettext which
ppl cloogppl; ppl cloogppl;
texinfo = texinfo4;
name = "ghdl"; name = "ghdl";
langVhdl = true; langVhdl = true;
langCC = false; langCC = false;
@ -2642,7 +2650,6 @@ let
julia = callPackage ../development/compilers/julia { julia = callPackage ../development/compilers/julia {
liblapack = liblapack.override {shared = true;}; liblapack = liblapack.override {shared = true;};
mpfr = mpfr_3_1_2;
fftw = fftw.override {pthreads = true;}; fftw = fftw.override {pthreads = true;};
fftwSinglePrec = fftwSinglePrec.override {pthreads = true;}; fftwSinglePrec = fftwSinglePrec.override {pthreads = true;};
}; };
@ -3542,6 +3549,7 @@ let
texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { }; texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { };
texinfo5 = callPackage ../development/tools/misc/texinfo/5.1.nix { }; texinfo5 = callPackage ../development/tools/misc/texinfo/5.1.nix { };
texinfo = texinfo5; texinfo = texinfo5;
texinfo4 = texinfo413;
texi2html = callPackage ../development/tools/misc/texi2html { }; texi2html = callPackage ../development/tools/misc/texi2html { };
@ -9453,7 +9461,8 @@ let
inherit fetchurl stdenv; inherit fetchurl stdenv;
inherit cups ghostscript glibc patchelf; inherit cups ghostscript glibc patchelf;
gcc = import ../development/compilers/gcc/4.4 { gcc = import ../development/compilers/gcc/4.4 {
inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gettext which; inherit stdenv fetchurl gmp mpfr noSysDirs gettext which;
texinfo = texinfo4;
profiledCompiler = true; profiledCompiler = true;
}; };
}; };