nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 18:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

GCC 4.4: Don't use the included Gettext.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16415
This commit is contained in:
Ludovic Courtès 2009-07-17 16:14:28 +00:00
parent 04cc6b721a
commit deb63071d7
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
, profiledCompiler ? false , profiledCompiler ? false
, staticCompiler ? false , staticCompiler ? false
, texinfo ? null , texinfo ? null
, gmp, mpfr , gmp, mpfr, gettext
, bison ? null, flex ? null , bison ? null, flex ? null
, zlib ? null, boehmgc ? null , zlib ? null, boehmgc ? null
, enableMultilib ? false , enableMultilib ? false
@ -50,12 +50,11 @@ stdenv.mkDerivation ({
patches = patches =
[./pass-cxxcpp.patch] [./pass-cxxcpp.patch]
++ optional noSysDirs ./no-sys-dirs.patch ++ optional noSysDirs ./no-sys-dirs.patch
++ optional (noSysDirs && langFortran) ./no-sys-dirs-fortran.patch ++ optional (noSysDirs && langFortran) ./no-sys-dirs-fortran.patch;
++ optional langJava ./java-jvgenmain-link.patch;
inherit noSysDirs profiledCompiler staticCompiler; inherit noSysDirs profiledCompiler staticCompiler;
buildInputs = [texinfo gmp mpfr] buildInputs = [ texinfo gmp mpfr gettext ]
++ (optionals langTreelang [bison flex]) ++ (optionals langTreelang [bison flex])
++ (optional (zlib != null) zlib) ++ (optional (zlib != null) zlib)
++ (optional (boehmgc != null) boehmgc) ++ (optional (boehmgc != null) boehmgc)
@ -64,6 +63,7 @@ stdenv.mkDerivation ({
configureFlags = " configureFlags = "
${if enableMultilib then "" else "--disable-multilib"} ${if enableMultilib then "" else "--disable-multilib"}
--disable-libstdcxx-pch --disable-libstdcxx-pch
--without-included-gettext
--with-system-zlib --with-system-zlib
--enable-languages=${ --enable-languages=${
concatStrings (intersperse "," concatStrings (intersperse ","
@ -87,7 +87,12 @@ stdenv.mkDerivation ({
meta = { meta = {
homepage = "http://gcc.gnu.org/"; homepage = "http://gcc.gnu.org/";
license = "GPL/LGPL"; license = "GPL/LGPL";
description = "GNU Compiler Collection, 4.3.x"; description = "GNU Compiler Collection, version ${version}";
maintainers = [
# Add your name here!
stdenv.lib.maintainers.ludo
];
}; };
} // (if langJava then { } // (if langJava then {
postConfigure = '' postConfigure = ''

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

@ -1661,7 +1661,7 @@ 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 noSysDirs; inherit fetchurl stdenv texinfo gmp mpfr gettext noSysDirs;
profiledCompiler = true; profiledCompiler = true;
}); });
@ -1727,7 +1727,7 @@ let
langCC = true; langCC = true;
langC = false; langC = false;
profiledCompiler = false; profiledCompiler = false;
inherit zlib boehmgc; inherit zlib boehmgc gettext;
}); });
#ghc = haskellPackages.ghc; #ghc = haskellPackages.ghc;