Author: shlevy
Date: Wed Apr 6 14:33:35 2011
New Revision: 26716
URL: https://svn.nixos.org/websvn/nix/?rev=26716&sc=1
Log:
Match nixpkgs trunk as much as possible
Added:
nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/0.11.nix
- copied, changed from r26689,
nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/default.nix
Deleted:
nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/bootstrap-tools.cpio.bz2
Modified:
nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/builder.sh
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/bootstrap/x86_64/default.nix
nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/default.nix
nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/make-bootstrap-tools.nix
nixpkgs/branches/stdenv-ada/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/builder.sh
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/builder.sh
Wed Apr 6 14:21:48 2011 (r26715)
+++ nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/builder.sh
Wed Apr 6 14:33:35 2011 (r26716)
@@ -8,9 +8,7 @@
# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad
# Thing.
export CPP="gcc -E"
-if test "$langCC" = "1"; then
- export CXXCPP="g++ -E" #We only want this if C++ is enabled
-fi
+export CXXCPP="g++ -E"
if test "$staticCompiler" = "1"; then
EXTRA_LDFLAGS="-static"
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
Wed Apr 6 14:21:48 2011 (r26715)
+++ nixpkgs/branches/stdenv-ada/pkgs/development/compilers/gcc-4.6/default.nix
Wed Apr 6 14:33:35 2011 (r26716)
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, noSysDirs
, langC ? true, langCC ? true, langFortran ? false, langTreelang ? false
, langJava ? false
-, langAda ? false
+, langAda ? true
, langVhdl ? false
, langGo ? false
, profiledCompiler ? false
@@ -199,7 +199,7 @@
else null;
inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic
- libcCross crossMingw langCC;
+ libcCross crossMingw;
buildNativeInputs = [ texinfo which ]
++ optional (perl != null) perl;
@@ -214,6 +214,7 @@
++ (optionals langJava [zip unzip])
++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs)
++ (optionals (cross != null) [binutilsCross])
+ ++ (optionals (gnatboot != null) [gnatboot])
++ (optionals langVhdl [gnat])
;
Copied and modified:
nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/0.11.nix (from
r26689, nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/default.nix)
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/default.nix
Mon Apr 4 22:52:47 2011 (r26689, copy source)
+++ nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/0.11.nix Wed Apr
6 14:33:35 2011 (r26716)
@@ -15,7 +15,7 @@
buildNativeInputs = [ perl gnum4 ];
propagatedBuildInputs = [ gmpxx ];
- dontDisableStatic = static;
+ dontDisableStatic = if static then true else false;
configureFlags = staticFlags;
# Beware! It took ~6 hours to compile PPL and run its tests on a 1.2 GHz
Modified: nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/default.nix
Wed Apr 6 14:21:48 2011 (r26715)
+++ nixpkgs/branches/stdenv-ada/pkgs/development/libraries/ppl/default.nix
Wed Apr 6 14:33:35 2011 (r26716)
@@ -1,21 +1,21 @@
{ fetchurl, stdenv, gmpxx, perl, gnum4, static ? false }:
let
- version = "0.11";
- staticFlags = if static then " --enable-static --disable-shared
--disable-watchdog" else "";
+ version = "0.10.2";
+ staticFlags = if static then " --enable-static --disable-shared" else "";
in
stdenv.mkDerivation rec {
name = "ppl-${version}";
src = fetchurl {
url = "mirror://gcc/infrastructure/ppl-${version}.tar.gz";
- sha256 = "0xqwyaj232gi0pgm6z2rihk6p8l1rngbbibnhmcrbq4jq550clrl";
+ sha256 = "0lly44sac4jd72klnhhil3wha15vak76r6gy88sh0zjsaww9hf6h";
};
buildNativeInputs = [ perl gnum4 ];
propagatedBuildInputs = [ gmpxx ];
- dontDisableStatic = static;
+ dontDisableStatic = if static then true else false;
configureFlags = staticFlags;
# Beware! It took ~6 hours to compile PPL and run its tests on a 1.2 GHz
Modified:
nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
Wed Apr 6 14:21:48 2011 (r26715)
+++ nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
Wed Apr 6 14:33:35 2011 (r26716)
@@ -4,7 +4,7 @@
{
bootstrapTools = {
- url =
http://nixos.org/tarballs/stdenv-linux/x86_64/r23302/bootstrap-tools.cpio.bz2;
- sha256 = "0w89kqhx47yl0jifp2vffp073pyrqha5f312kp971smi4h41drna";
+ url = http://www.shealevy.com/bootstrap-tools.cpio.bz2;
+ sha256 = "18qg8xanrzprhy9z7z499pgwifsnrpz6shh230rbf3zg8cfgjj2x";
};
}
Modified: nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/default.nix Wed Apr 6
14:21:48 2011 (r26715)
+++ nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/default.nix Wed Apr 6
14:33:35 2011 (r26716)
@@ -60,7 +60,9 @@
inherit (bootstrapFiles) bzip2 mkdir curl cpio;
- tarball = ./bootstrap-tools.cpio.bz2;
+ tarball = download {
+ inherit (bootstrapFiles.bootstrapTools) url sha256;
+ };
inherit system;
@@ -210,20 +212,21 @@
};
gccWithStaticLibs = stdenvLinuxBoot3Pkgs.gcc.gcc.override (rec {
- ppl = stdenvLinuxBoot3Pkgs.ppl.override {
- static = true;
- gmpxx = stdenvLinuxBoot3Pkgs.gmpxx.override {
- static = true;
- };
- };
-
- cloog = stdenvLinuxBoot3Pkgs.cloog.override {
- isl = stdenvLinuxBoot3Pkgs.isl.override {
- static = true;
- };
- static = true;
- };
- });
+ ppl = stdenvLinuxBoot3Pkgs.ppl0_11.override {
+ static = true;
+ gmpxx = stdenvLinuxBoot3Pkgs.gmpxx.override {
+ static = true;
+ };
+ };
+
+ cloog = stdenvLinuxBoot3Pkgs.cloog.override {
+ isl = stdenvLinuxBoot3Pkgs.isl.override {
+ static = true;
+ };
+ static = true;
+ };
+ });
+
# 8) Construct a fourth stdenv identical to the second, except that
# this one uses the dynamically linked GCC and Binutils from step
Modified: nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/make-bootstrap-tools.nix
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/make-bootstrap-tools.nix
Wed Apr 6 14:21:48 2011 (r26715)
+++ nixpkgs/branches/stdenv-ada/pkgs/stdenv/linux/make-bootstrap-tools.nix
Wed Apr 6 14:33:35 2011 (r26716)
@@ -77,6 +77,7 @@
CLEAR
CONFIG_STATIC y
CONFIG_CPIO y
+ # (shlevy) Are these necessary?
CONFIG_FEATURE_CPIO_O y
CONFIG_FEATURE_CPIO_P y
'';
@@ -137,13 +138,13 @@
cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
# Copy what we need of GCC.
- cp -d ${gnat.gcc}/bin/gcc $out/bin
- cp -d ${gnat.gcc}/bin/cpp $out/bin
- cp -d ${gnat.gcc}/bin/g++ $out/bin
- cp -d ${gnat.gcc}/bin/gnat* $out/bin
- cp -d ${gnat.gcc}/lib*/libgcc_s.so* $out/lib
- cp -d ${gnat.gcc}/lib*/libstdc++.so* $out/lib
- cp -rd ${gnat.gcc}/lib/gcc $out/lib
+ cp -d ${gcc.gcc}/bin/gcc $out/bin
+ cp -d ${gcc.gcc}/bin/cpp $out/bin
+ cp -d ${gcc.gcc}/bin/g++ $out/bin
+ cp -d ${gcc.gcc}/bin/gnat* $out/bin
+ cp -d ${gcc.gcc}/lib*/libgcc_s.so* $out/lib
+ cp -d ${gcc.gcc}/lib*/libstdc++.so* $out/lib
+ cp -rd ${gcc.gcc}/lib/gcc $out/lib
chmod -R u+w $out/lib
rm -f $out/lib/gcc/*/*/include*/linux
rm -f $out/lib/gcc/*/*/include*/sound
@@ -151,9 +152,9 @@
rm -f $out/lib/gcc/*/*/include-fixed/asm
rm -rf $out/lib/gcc/*/*/plugin
#rm -f $out/lib/gcc/*/*/*.a
- cp -rd ${gnat.gcc}/libexec/* $out/libexec
+ cp -rd ${gcc.gcc}/libexec/* $out/libexec
mkdir $out/include
- cp -rd ${gnat.gcc}/include/c++ $out/include
+ cp -rd ${gcc.gcc}/include/c++ $out/include
chmod -R u+w $out/include
rm -rf $out/include/c++/*/ext/pb_ds
rm -rf $out/include/c++/*/ext/parallel
Modified: nixpkgs/branches/stdenv-ada/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-ada/pkgs/top-level/all-packages.nix Wed Apr 6
14:21:48 2011 (r26715)
+++ nixpkgs/branches/stdenv-ada/pkgs/top-level/all-packages.nix Wed Apr 6
14:33:35 2011 (r26716)
@@ -1128,6 +1128,8 @@
ppl = callPackage ../development/libraries/ppl { };
+ ppl0_11 = callPackage ../development/libraries/ppl/0.11.nix { };
+
/* WARNING: this version is unsuitable for using with a setuid wrapper */
ppp = builderDefsPackage (import ../tools/networking/ppp) {
};
@@ -1681,6 +1683,7 @@
(makeOverridable (import ../development/compilers/gcc-4.6) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
cloog gettext which noSysDirs;
+ ppl = ppl0_11;
binutilsCross = binutilsCross;
libcCross = libcCross;
profiledCompiler = false;
@@ -1753,7 +1756,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;
- langAda = true;
+ ppl = ppl0_11;
# bootstrapping a profiled compiler does not work in the sheevaplug:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
@@ -1888,7 +1891,7 @@
gnat45 = wrapGCC (gcc45_real.gcc.override {
name = "gnat";
- langCC = true;
+ langCC = false;
langC = true;
langAda = true;
profiledCompiler = false;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
