bash 5.1: don't rely on patch timestamps in build

When, after patching, `configure.ac` is newer than `configure`, the
Makefile will try to regenerate `configure` from `configure.ac`.

While that might usually be desirable, in this case we want to keep
bootstrapping simple and directly use the `configure` from the package
so we can avoid a dependency on automake.

Previously, we used the `-T` parameter to automake to make sure the
timestamps were okay. However, this is brittle when we update: when the
timestamp of the original file changes, and no longer matches the
timestamp of the original file in the patch, `patch` will show a warning
but otherwise continue without updating the timestamp.

This PR changes things so we only patch `configure`, so that will always
have a newer timestamp.

We will update bash-4.4 in a separate PR (but that one has a bigger rebuild
impact so will have to target staging)

Refs #115177

This commit is contained in:

Arnout Engelen

2021-03-22 12:27:10 +01:00

parent f5e8bdd07d

commit 078c2a7341

2 changed files with 1 additions and 16 deletions

									
										pkgs/shells/bash/5.1.nix
									
		+1
		-1
	
												View File
												
				@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {

				    -DSSH_SOURCE_BASHRC

				  '';

				  patchFlags = [ "-p0" "-T" ];

				  patchFlags = [ "-p0" ];

				  patches = upstreamPatches

				    ++ [ ./pgrp-pipe-5.1.patch ];