Author: shlevy
Date: Mon Apr 4 22:52:47 2011
New Revision: 26689
URL: https://svn.nixos.org/websvn/nix/?rev=26689&sc=1
Log:
Get an stdenv with gnat-enabled gcc 4.6 to compile
Added:
nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/bootstrap-tools.cpio.bz2
Deleted:
nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/0.11.nix
Modified:
nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/default.nix
nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/default.nix
nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/default.nix
nixpkgs/branches/stdenv-ada/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/default.nix
Mon Apr 4 22:46:51 2011 (r26688)
+++ nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/default.nix
Mon Apr 4 22:52:47 2011 (r26689)
@@ -34,7 +34,6 @@
assert langJava -> zip != null && unzip != null
&& zlib != null && boehmgc != null
&& perl != null; # for `--enable-java-home'
-assert langAda -> gnatboot != null;
assert langVhdl -> gnat != null;
# LTO needs libelf and zlib.
@@ -215,14 +214,12 @@
++ (optionals langJava [zip unzip])
++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs)
++ (optionals (cross != null) [binutilsCross])
- ++ (optionals langAda [gnatboot])
++ (optionals langVhdl [gnat])
;
configureFlagsArray = stdenv.lib.optionals
(ppl != null && ppl.dontDisableStatic == true)
- [ "--with-host-libstdcxx=-lstdc++ -lgcc_s"
- "--with-stage1-libs=-lstdc++ -lgcc_s" ];
+ [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ];
configureFlags = "
${if enableMultilib then "" else "--disable-multilib"}
Modified: nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/default.nix
Mon Apr 4 22:46:51 2011 (r26688)
+++ nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/default.nix
Mon Apr 4 22:52:47 2011 (r26689)
@@ -1,21 +1,21 @@
{ fetchurl, stdenv, gmpxx, perl, gnum4, static ? false }:
let
- version = "0.10.2";
- staticFlags = if static then " --enable-static --disable-shared" else "";
+ version = "0.11";
+ staticFlags = if static then " --enable-static --disable-shared
--disable-watchdog" else "";
in
stdenv.mkDerivation rec {
name = "ppl-${version}";
src = fetchurl {
url = "mirror://gcc/infrastructure/ppl-${version}.tar.gz";
- sha256 = "0lly44sac4jd72klnhhil3wha15vak76r6gy88sh0zjsaww9hf6h";
+ sha256 = "0xqwyaj232gi0pgm6z2rihk6p8l1rngbbibnhmcrbq4jq550clrl";
};
buildNativeInputs = [ perl gnum4 ];
propagatedBuildInputs = [ gmpxx ];
- dontDisableStatic = if static then true else false;
+ dontDisableStatic = static;
configureFlags = staticFlags;
# Beware! It took ~6 hours to compile PPL and run its tests on a 1.2 GHz
Added: nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/bootstrap-tools.cpio.bz2
==============================================================================
Binary files /dev/null 00:00:00 1970 (empty, because file is newly added)
and nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/bootstrap-tools.cpio.bz2 Mon
Apr 4 22:52:47 2011 (r26689) differ
Modified: nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/default.nix Mon Apr 4
22:46:51 2011 (r26688)
+++ nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/default.nix Mon Apr 4
22:52:47 2011 (r26689)
@@ -60,9 +60,7 @@
inherit (bootstrapFiles) bzip2 mkdir curl cpio;
- tarball = download {
- inherit (bootstrapFiles.bootstrapTools) url sha256;
- };
+ tarball = ./bootstrap-tools.cpio.bz2;
inherit system;
@@ -218,8 +216,11 @@
static = true;
};
};
- cloogppl = stdenvLinuxBoot3Pkgs.cloogppl.override {
- inherit ppl;
+
+ cloog = stdenvLinuxBoot3Pkgs.cloog.override {
+ isl = stdenvLinuxBoot3Pkgs.isl.override {
+ static = true;
+ };
static = true;
};
});
Modified: nixpkgs/branches/stdenv-ada/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/top-level/all-packages.nix Mon Apr 4
22:46:51 2011 (r26688)
+++ nixpkgs/branches/stdenv-ada/pkgs/top-level/all-packages.nix Mon Apr 4
22:52:47 2011 (r26689)
@@ -1598,7 +1598,7 @@
gambit = callPackage ../development/compilers/gambit { };
- gcc = gcc45;
+ gcc = gcc46;
gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 {
inherit fetchurl stdenv noSysDirs;
@@ -1681,7 +1681,6 @@
(makeOverridable (import ../development/compilers/gcc-4.6) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
cloog gettext which noSysDirs;
- ppl = callPackage ../development/libraries/ppl/0.11.nix { };
binutilsCross = binutilsCross;
libcCross = libcCross;
profiledCompiler = false;
@@ -1754,7 +1753,7 @@
gcc46_real = lowPrio (wrapGCC (makeOverridable (import
../development/compilers/gcc-4.6) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl
cloog gettext which noSysDirs;
- ppl = callPackage ../development/libraries/ppl/0.11.nix { };
+ langAda = true;
# bootstrapping a profiled compiler does not work in the sheevaplug:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
