diff options
Diffstat (limited to 'pkgs/build-support')
-rwxr-xr-x | pkgs/build-support/buildenv/builder.pl | 40 | ||||
-rw-r--r-- | pkgs/build-support/ocaml/default.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/ocaml/dune.nix | 6 | ||||
-rw-r--r-- | pkgs/build-support/setup-hooks/autoreconf.sh | 2 | ||||
-rw-r--r-- | pkgs/build-support/setup-hooks/reproducible-builds.sh | 3 | ||||
-rw-r--r-- | pkgs/build-support/setup-hooks/separate-debug-info.sh | 2 |
6 files changed, 46 insertions, 11 deletions
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 411b147cc58ef..ebd6026b25979 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -10,7 +10,11 @@ use JSON::PP; STDOUT->autoflush(1); +$SIG{__WARN__} = sub { warn "warning: ", @_ }; +$SIG{__DIE__} = sub { die "error: ", @_ }; + my $out = $ENV{"out"}; +my $extraPrefix = $ENV{"extraPrefix"}; my @pathsToLink = split ' ', $ENV{"pathsToLink"}; @@ -88,6 +92,10 @@ sub findFilesInDir { sub checkCollision { my ($path1, $path2) = @_; + if (! -e $path1 || ! -e $path2) { + return 0; + } + my $stat1 = (stat($path1))[2]; my $stat2 = (stat($path2))[2]; @@ -101,6 +109,11 @@ sub checkCollision { return compare($path1, $path2) == 0; } +sub prependDangling { + my $path = shift; + return (-l $path && ! -e $path ? "dangling symlink " : "") . "`$path'"; +} + sub findFiles { my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_; @@ -125,12 +138,21 @@ sub findFiles { # symlink to a file (not a directory) in a lower-priority package, # overwrite it. if (!defined $oldTarget || ($priority < $oldPriority && ($oldTarget ne "" && ! -d $oldTarget))) { + # If target is a dangling symlink, emit a warning. + if (-l $target && ! -e $target) { + my $link = readlink $target; + warn "creating dangling symlink `$out$extraPrefix/$relName' -> `$target' -> `$link'\n"; + } $symlinks{$relName} = [$target, $priority]; return; } # If target already exists and both targets resolves to the same path, skip - if (defined $oldTarget && $oldTarget ne "" && abs_path($target) eq abs_path($oldTarget)) { + if ( + defined $oldTarget && $oldTarget ne "" && + defined abs_path($target) && defined abs_path($oldTarget) && + abs_path($target) eq abs_path($oldTarget) + ) { # Prefer the target that is not a symlink, if any if (-l $oldTarget && ! -l $target) { $symlinks{$relName} = [$target, $priority]; @@ -144,14 +166,25 @@ sub findFiles { return; } + # If target is supposed to be a directory but it isn't, die with an error message + # instead of attempting to recurse into it, only to fail then. + # This happens e.g. when pathsToLink contains a non-directory path. + if ($oldTarget eq "" && ! -d $target) { + die "not a directory: `$target'\n"; + } + unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) { + # Prepend "dangling symlink" to paths if applicable. + my $targetRef = prependDangling($target); + my $oldTargetRef = prependDangling($oldTarget); + if ($ignoreCollisions) { - warn "collision between `$target' and `$oldTarget'\n" if $ignoreCollisions == 1; + warn "collision between $targetRef and $oldTargetRef\n" if $ignoreCollisions == 1; return; } elsif ($checkCollisionContents && checkCollision($oldTarget, $target)) { return; } else { - die "collision between `$target' and `$oldTarget'\n"; + die "collision between $targetRef and $oldTargetRef\n"; } } @@ -224,7 +257,6 @@ while (scalar(keys %postponed) > 0) { # Create the symlinks. -my $extraPrefix = $ENV{"extraPrefix"}; my $nrLinks = 0; foreach my $relName (sort keys %symlinks) { my ($target, $priority) = @{$symlinks{$relName}}; diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix index 88ed3dfc2c2f3..cd17eb688c2e4 100644 --- a/pkgs/build-support/ocaml/default.nix +++ b/pkgs/build-support/ocaml/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }: -{ name, version, buildInputs ? [], +{ name, version, nativeBuildInputs ? [], createFindlibDestdir ? true, dontStrip ? true, minimumSupportedOcamlVersion ? null, @@ -19,7 +19,7 @@ in stdenv.mkDerivation (args // { name = "ocaml-${name}-${version}"; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ] ++ buildInputs; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ] ++ nativeBuildInputs; setupHook = if setupHook == null && hasSharedObjects then writeText "setupHook.sh" '' diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index c049878d01311..6bdec501630e9 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,6 +1,6 @@ { lib, stdenv, ocaml, findlib, dune_1, dune_2 }: -{ pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: +{ pname, version, nativeBuildInputs ? [], enableParallelBuilding ? true, ... }@args: let Dune = if args.useDune2 or false then dune_2 else dune_1; in @@ -12,6 +12,8 @@ else stdenv.mkDerivation ({ inherit enableParallelBuilding; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; buildPhase = '' runHook preBuild @@ -33,7 +35,7 @@ stdenv.mkDerivation ({ name = "ocaml${ocaml.version}-${pname}-${version}"; - buildInputs = [ ocaml Dune findlib ] ++ buildInputs; + nativeBuildInputs = [ ocaml Dune findlib ] ++ nativeBuildInputs; meta = (args.meta or {}) // { platforms = args.meta.platforms or ocaml.meta.platforms; }; diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh index c08cab1586882..6ce879ac092de 100644 --- a/pkgs/build-support/setup-hooks/autoreconf.sh +++ b/pkgs/build-support/setup-hooks/autoreconf.sh @@ -1,4 +1,4 @@ -preConfigurePhases+=" autoreconfPhase" +preConfigurePhases="${preConfigurePhases:-} autoreconfPhase" autoreconfPhase() { runHook preAutoreconf diff --git a/pkgs/build-support/setup-hooks/reproducible-builds.sh b/pkgs/build-support/setup-hooks/reproducible-builds.sh index 5b01c213fe4a7..7b52f84df67b4 100644 --- a/pkgs/build-support/setup-hooks/reproducible-builds.sh +++ b/pkgs/build-support/setup-hooks/reproducible-builds.sh @@ -2,8 +2,9 @@ # This should ensure that it is deterministic across rebuilds of the same # derivation and not easily collide with other builds. # We also truncate the hash so that it cannot cause reference cycles. -export NIX_CFLAGS_COMPILE+=" -frandom-seed=$( +NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE:-} -frandom-seed=$( outbase="${out##*/}" randomseed="${outbase:0:10}" echo $randomseed )" +export NIX_CFLAGS_COMPILE diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh index 19dbb10d18e72..2481d8f50470c 100644 --- a/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -14,7 +14,7 @@ _separateDebugInfo() { dst="$dst/lib/debug/.build-id" # Find executables and dynamic libraries. - local i magic + local i while IFS= read -r -d $'\0' i; do if ! isELF "$i"; then continue; fi |