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

Refactor stage handling in stdenvLinux

Browse Source 
Make stages explicit and generalize the pattern of having an stdenv and
a pkgs collection for all stages to a common stage generating function
called stageFun.

Rewrite all stage handling with this new function.

This commit doesn't change the outhash (or drvhash) of the stdenv.
This commit is contained in:
Gergely Risko 2014-08-23 21:26:37 +02:00
parent 142970b9eb
commit 350022247a
1 changed files with 80 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
pkgs/stdenv/linux/default.nix
View File

@ -35,8 +35,8 @@ rec {
# The bootstrap process proceeds in several steps. # The bootstrap process proceeds in several steps.
# 1) Create a standard environment by downloading pre-built binaries # Create a standard environment by downloading pre-built binaries of
# of coreutils, GCC, etc. # coreutils, GCC, etc.
# Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...). # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...).
@ -67,11 +67,13 @@ rec {
# This function builds the various standard environments used during # This function builds the various standard environments used during
# the bootstrap. # the bootstrap. In all stages, we build an stdenv and the package
stdenvBootFun = # set that can be built with that stdenv.
stageFun =
{gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? []}: {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? []}:
let thisStdenv = import ../generic { let
thisStdenv = import ../generic {
inherit system config; inherit system config;
name = "stdenv-linux-boot"; name = "stdenv-linux-boot";
preHook = preHook =
@ -84,7 +86,7 @@ rec {
shell = "${bootstrapTools}/bin/sh"; shell = "${bootstrapTools}/bin/sh";
initialPath = [bootstrapTools] ++ extraPath; initialPath = [bootstrapTools] ++ extraPath;
fetchurlBoot = import ../../build-support/fetchurl { fetchurlBoot = import ../../build-support/fetchurl {
stdenv = stdenvLinuxBoot0; stdenv = stage0.stdenv;
curl = bootstrapTools; curl = bootstrapTools;
}; };
inherit gcc; inherit gcc;
@ -93,26 +95,32 @@ rec {
extraAttrs = extraAttrs // { inherit platform; }; extraAttrs = extraAttrs // { inherit platform; };
overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; }; overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
}; };
in thisStdenv; thisPkgs = allPackages {
inherit system platform;
bootStdenv = thisStdenv;
};
in { stdenv = thisStdenv; pkgs = thisPkgs; };
# Build a dummy stdenv with no GCC or working fetchurl. This is # Build a dummy stdenv with no GCC or working fetchurl. This is
# because we need a stdenv to build the GCC wrapper and fetchurl. # because we need a stdenv to build the GCC wrapper and fetchurl.
stdenvLinuxBoot0 = stdenvBootFun { stage0 = stageFun {
gcc = "/no-such-path"; gcc = "/no-such-path";
};
overrides = pkgs: {
# The Glibc include directory cannot have the same prefix as the GCC # The Glibc include directory cannot have the same prefix as the
# include directory, since GCC gets confused otherwise (it will # GCC include directory, since GCC gets confused otherwise (it
# search the Glibc headers before the GCC headers). So create a # will search the Glibc headers before the GCC headers). So
# dummy Glibc. # create a dummy Glibc here, which will be used in the stdenv of
bootstrapGlibc = stdenvLinuxBoot0.mkDerivation { # stage1.
name = "bootstrap-glibc"; glibc = stage0.stdenv.mkDerivation {
buildCommand = '' name = "bootstrap-glibc";
mkdir -p $out buildCommand = ''
ln -s ${bootstrapTools}/lib $out/lib mkdir -p $out
ln -s ${bootstrapTools}/include-glibc $out/include ln -s ${bootstrapTools}/lib $out/lib
''; ln -s ${bootstrapTools}/include-glibc $out/include
'';
};
};
}; };
@ -124,78 +132,58 @@ rec {
nativeTools = false; nativeTools = false;
nativeLibc = false; nativeLibc = false;
inherit gcc binutils coreutils libc name; inherit gcc binutils coreutils libc name;
stdenv = stdenvLinuxBoot0; stdenv = stage0.stdenv;
}; };
# Create the first "real" standard environment. This one consists # Create the first "real" standard environment. This one consists
# of bootstrap tools only, and a minimal Glibc to keep the GCC # of bootstrap tools only, and a minimal Glibc to keep the GCC
# configure script happy. # configure script happy.
stdenvLinuxBoot1 = stdenvBootFun { stage1 = stageFun {
gcc = wrapGCC { gcc = wrapGCC {
gcc = bootstrapTools; gcc = bootstrapTools;
libc = bootstrapGlibc; libc = stage0.pkgs.glibc;
binutils = bootstrapTools; binutils = bootstrapTools;
coreutils = bootstrapTools; coreutils = bootstrapTools;
name = "bootstrap-gcc-wrapper"; name = "bootstrap-gcc-wrapper";
}; };
# Rebuild binutils to use from stage2 onwards.
overrides = pkgs: {
binutils = pkgs.binutils.override { gold = false; };
};
}; };
# 2) These are the packages that we can build with the first # 2nd stdenv that contains our own rebuilt binutils and is used for
# stdenv. We only need binutils, because recent Glibcs # compiling our own Glibc.
# require recent Binutils, and those in bootstrap-tools may stage2 = stageFun {
# be too old.
stdenvLinuxBoot1Pkgs = allPackages {
inherit system platform;
bootStdenv = stdenvLinuxBoot1;
};
binutils1 = stdenvLinuxBoot1Pkgs.binutils.override { gold = false; };
# 3) 2nd stdenv that we will use to build only Glibc.
stdenvLinuxBoot2 = stdenvBootFun {
gcc = wrapGCC { gcc = wrapGCC {
gcc = bootstrapTools; gcc = bootstrapTools;
libc = bootstrapGlibc; libc = stage0.pkgs.glibc;
binutils = binutils1; binutils = stage1.pkgs.binutils;
coreutils = bootstrapTools; coreutils = bootstrapTools;
name = "bootstrap-gcc-wrapper"; name = "bootstrap-gcc-wrapper";
}; };
overrides = pkgs: { overrides = pkgs: {
inherit (stdenvLinuxBoot1Pkgs) perl; inherit (stage1.pkgs) perl;
# This also contains the full, dynamically linked, final Glibc.
}; };
}; };
# 4) These are the packages that we can build with the 2nd # Construct a third stdenv identical to the 2nd, except that this
# stdenv. # one uses the rebuilt Glibc from stage2. It still uses the recent
stdenvLinuxBoot2Pkgs = allPackages { # binutils and rest of the bootstrap tools, including GCC.
inherit system platform; stage3 = stageFun {
bootStdenv = stdenvLinuxBoot2;
};
# 5) Build Glibc with the bootstrap tools. The result is the full,
# dynamically linked, final Glibc.
stdenvLinuxGlibc = stdenvLinuxBoot2Pkgs.glibc;
# 6) Construct a third stdenv identical to the 2nd, except that this
# one uses the Glibc built in step 5. It still uses the recent
# binutils and rest of the bootstrap tools, including GCC.
stdenvLinuxBoot3 = stdenvBootFun {
gcc = wrapGCC { gcc = wrapGCC {
gcc = bootstrapTools; gcc = bootstrapTools;
libc = stdenvLinuxGlibc; libc = stage2.pkgs.glibc;
binutils = binutils1; binutils = stage1.pkgs.binutils;
coreutils = bootstrapTools; coreutils = bootstrapTools;
name = "bootstrap-gcc-wrapper"; name = "bootstrap-gcc-wrapper";
}; };
overrides = pkgs: { overrides = pkgs: {
glibc = stdenvLinuxGlibc; inherit (stage2.pkgs) glibc perl;
inherit (stdenvLinuxBoot1Pkgs) perl;
# Link GCC statically against GMP etc. This makes sense because # Link GCC statically against GMP etc. This makes sense because
# these builds of the libraries are only used by GCC, so it # these builds of the libraries are only used by GCC, so it
# reduces the size of the stdenv closure. # reduces the size of the stdenv closure.
@ -207,52 +195,37 @@ rec {
ppl = pkgs.ppl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; ppl = pkgs.ppl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
}; };
extraAttrs = { extraAttrs = {
glibc = stdenvLinuxGlibc; # Required by gcc47 build glibc = stage2.pkgs.glibc; # Required by gcc47 build
}; };
extraPath = [ stdenvLinuxBoot1Pkgs.paxctl ]; extraPath = [ stage1.pkgs.paxctl ];
}; };
# 7) The packages that can be built using the third stdenv. # Construct a fourth stdenv that uses the new GCC. But coreutils is
stdenvLinuxBoot3Pkgs = allPackages { # still from the bootstrap tools.
inherit system platform; stage4 = stageFun {
bootStdenv = stdenvLinuxBoot3; gcc = wrapGCC {
}; gcc = stage3.pkgs.gcc.gcc;
libc = stage2.pkgs.glibc;
binutils = stage1.pkgs.binutils;
# 8) Construct a fourth stdenv identical to the second, except that
# this one uses the new GCC from step 7. The other tools
# (e.g. coreutils) are still from the bootstrap tools.
stdenvLinuxBoot4 = stdenvBootFun {
gcc = wrapGCC rec {
gcc = stdenvLinuxBoot3Pkgs.gcc.gcc;
libc = stdenvLinuxGlibc;
binutils = binutils1;
coreutils = bootstrapTools; coreutils = bootstrapTools;
name = ""; name = "";
}; };
extraPath = [ stdenvLinuxBoot3Pkgs.xz ]; extraPath = [ stage3.pkgs.xz ];
overrides = pkgs: { overrides = pkgs: {
inherit (stdenvLinuxBoot1Pkgs) perl; inherit (stage1.pkgs) perl;
inherit (stdenvLinuxBoot3Pkgs) gettext gnum4 gmp; inherit (stage3.pkgs) gettext gnum4 gmp glibc;
}; };
}; };
# 9) The packages that can be built using the fourth stdenv. # Construct the final stdenv. It uses the Glibc and GCC, and adds
stdenvLinuxBoot4Pkgs = allPackages { # in a new binutils that doesn't depend on bootstrap-tools, as well
inherit system platform; # as dynamically linked versions of all other tools.
bootStdenv = stdenvLinuxBoot4;
};
# 10) Construct the final stdenv. It uses the Glibc and GCC, and
# adds in a new binutils that doesn't depend on bootstrap-tools,
# as well as dynamically linked versions of all other tools.
# #
# When updating stdenvLinux, make sure that the result has no # When updating stdenvLinux, make sure that the result has no
# dependency (`nix-store -qR') on bootstrapTools or the # dependency (`nix-store -qR') on bootstrapTools or the first
# first binutils built. # binutils built.
stdenvLinux = import ../generic rec { stdenvLinux = import ../generic rec {
inherit system config; inherit system config;
@ -265,31 +238,31 @@ rec {
''; '';
initialPath = initialPath =
((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;}) ((import ../common-path.nix) {pkgs = stage4.pkgs;})
++ [stdenvLinuxBoot4Pkgs.patchelf stdenvLinuxBoot4Pkgs.paxctl ]; ++ [stage4.pkgs.patchelf stage4.pkgs.paxctl ];
shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash"; shell = stage4.pkgs.bash + "/bin/bash";
gcc = (wrapGCC rec { gcc = (wrapGCC rec {
gcc = stdenvLinuxBoot4.gcc.gcc; gcc = stage4.stdenv.gcc.gcc;
libc = stdenvLinuxGlibc; libc = stage4.pkgs.glibc;
inherit (stdenvLinuxBoot4Pkgs) binutils coreutils; inherit (stage4.pkgs) binutils coreutils;
name = ""; name = "";
}).override { inherit shell; }; }).override { inherit shell; };
fetchurlBoot = stdenvLinuxBoot0.fetchurlBoot; fetchurlBoot = stage4.stdenv.fetchurl;
extraAttrs = { extraAttrs = {
inherit (stdenvLinuxBoot3Pkgs) glibc; inherit (stage4.pkgs) glibc;
inherit platform bootstrapTools; inherit platform bootstrapTools;
shellPackage = stdenvLinuxBoot4Pkgs.bash; shellPackage = stage4.pkgs.bash;
}; };
overrides = pkgs: { overrides = pkgs: {
inherit gcc; inherit gcc;
inherit (stdenvLinuxBoot3Pkgs) glibc; inherit (stage3.pkgs) glibc;
inherit (stdenvLinuxBoot4Pkgs) binutils; inherit (stage4.pkgs) binutils;
inherit (stdenvLinuxBoot4Pkgs) inherit (stage4.pkgs)
gzip bzip2 xz bash coreutils diffutils findutils gawk gzip bzip2 xz bash coreutils diffutils findutils gawk
gnumake gnused gnutar gnugrep gnupatch patchelf gnumake gnused gnutar gnugrep gnupatch patchelf
attr acl paxctl; attr acl paxctl;