bash: don't rely on patch timestamps in build #117127
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. Refs NixOS#115177
|
I assume that the |
|
Good idea. I can split it up tomorrow, if you want it sooner feel free to open a separate PR
…On 21 March 2021 17:33:10 CET, Anders Kaseorg ***@***.***> wrote:
I assume that the `bash` change needs to go through `staging`. Perhaps it can be split from the `bash_5` change, which is the only one causing a real problem right now and can go through `master`.
--
You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub:
#117127 (comment)
|
|
/rebase staging |
|
broke out the bash_5 part into #117210, retargeted this one to staging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
When, after patching,
configure.acis newer thanconfigure, theMakefile will try to regenerate
configurefromconfigure.ac.While that might usually be desirable, in this case we want to keep
bootstrapping simple and directly use the
configurefrom the packageso we can avoid a dependency on automake.
Previously, we used the
-Tparameter to automake to make sure thetimestamps 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,
patchwill show a warningbut otherwise continue without updating the timestamp.
This PR changes things so we only patch
configure, so that will alwayshave a newer timestamp.
Refs #115177
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)