Repository navigation
[CMake] Always patch the builtins starting from the pristine sources - #24016
Merged
pcanal merged 1 commit intoNov 6, 2026
Merged
Conversation
Test Results 22 files 22 suites 3d 12h 43m 7s ⏱️ Results for commit 3807741. ♻️ This comment has been updated with latest results. |
guitargeek
force-pushed
the
fix-unuran-incremental-patch
branch
from
November 6, 2026 07:23
0ca3a70 to
c7b8d99
Compare
pcanal
reviewed
Nov 6, 2026
ExternalProject re-runs the patch step not only after a new download, but also when the patch command changes, and then on the already patched tree. Since 0db7792 changed the unuran patch command, this breaks the incremental opensuse CI build. The configure-time checks of the other builtins with patches fail the other way around: after a new download, they skip the patches. Add ROOT_BUILTIN_PATCH_COMMAND, whose patch step commits the pristine sources to a git repository in the source directory and resets to them before applying the patches, so it can always run. Trees patched by the old commands are handled by undoing their patches first, or, if that fails, by downloading the sources again. Use it for all builtins with patches. 🤖 Done with the help of AI
guitargeek
force-pushed
the
fix-unuran-incremental-patch
branch
from
November 6, 2026 10:59
c7b8d99 to
3807741
Compare
pcanal
approved these changes
Nov 6, 2026
pcanal
left a comment
pcanal
left a comment
Member
There was a problem hiding this comment.
Let's merge as is since it seems to fix the issue in practice.
Member
|
/backport to v6.42 |
Contributor
Author
|
/backport to 6.42 |
|
Preparing to backport PR #24016 to branch 6.42 requested by guitargeek |
|
Something went wrong with the creation of the PR to backport to 6.42: @guitargeek please see the logs |
Contributor
Author
|
/backport to 6.42 |
|
Preparing to backport PR #24016 to branch 6.42 requested by guitargeek |
|
This PR has been backported to branch 6.42: #24046 |
This file contains hidden or 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
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.
ExternalProject re-runs the patch step not only after a new download, but also when the patch command changes, and then on the already patched tree. Since 0db7792 changed the unuran patch command, this breaks the incremental opensuse CI build. The configure-time checks of the other builtins with patches fail the other way around: after a new download, they skip the patches.
Add ROOT_BUILTIN_PATCH_COMMAND, whose patch step commits the pristine sources to a git repository in the source directory and resets to them before applying the patches, so it can always run. Trees patched by the old commands are handled by undoing their patches first, or, if that fails, by downloading the sources again. Use it for all builtins with patches.
🤖 Done with the help of AI