Separate libunwind into 1.3.2 and 1.5.0 builders, add a patch #3856
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
ararslan
added
the
julia 💜 ❤️ 💚
giordano
requested changes
Nov 6, 2021
There was a problem hiding this comment.
Looks good overall, but I'd suggest to reorganise this a bit, to avoid duplication:
- have a file
L/LibUnwind/common.jlwith most variables defined there, in particular thescript. We have plenty of similar setups for other Julia dependencies, like LLVM and OpenBLAS - create the 1.5.0 directory in a separate pull request, otherwise registration is going to fail because of merge conflicts, which are a mess to manually fix when involve different compat bounds.
I know this is an extra hassle now, but we'll make it way easier to add more versions later on.
azure-pipelines.yml
Outdated
Comment on lines
62
to
63
| else | ||
| delay = Second(0) |
There was a problem hiding this comment.
I cherry-picked this in #3858, since this is blocking everything at the moment.
The current version being built is 1.5.0, so the files now live in `LibUnwind@1.5.0`.
ararslan
force-pushed
the
aa/bifurcate-libunwind
branch
from
7ca887b
to
ec220a0
Compare
giordano
approved these changes
Nov 6, 2021
|
Note: This PR was restructured to just be 1.5.0, and I'll be submitting a follow-up with 1.3.2. |
ararslan
added a commit
that referenced
this pull request
Nov 6, 2021
PR #3856 refactored the previous master into a builder specifically for libunwind v1.5.0. To avoid issues with automated JLL registration, it only did that version. This commit now adds a separate builder for v1.3.2, the version of libunwind currently in use by Julia. Note that to avoid said issues with registration, this commit does not refactor the other builder to use a common setup; that can be done separately to reduce duplication.
giordano
pushed a commit
that referenced
this pull request
Nov 6, 2021
PR #3856 refactored the previous master into a builder specifically for libunwind v1.5.0. To avoid issues with automated JLL registration, it only did that version. This commit now adds a separate builder for v1.3.2, the version of libunwind currently in use by Julia. Note that to avoid said issues with registration, this commit does not refactor the other builder to use a common setup; that can be done separately to reduce duplication.
simeonschaub
pushed a commit
to simeonschaub/Yggdrasil
that referenced
this pull request
Feb 23, 2022
…ackaging#3856) * Move libunwind files to a versioned subdirectory The current version being built is 1.5.0, so the files now live in `LibUnwind@1.5.0`. * Add libunwind PR 308 as a patch
simeonschaub
pushed a commit
to simeonschaub/Yggdrasil
that referenced
this pull request
Feb 23, 2022
PR JuliaPackaging#3856 refactored the previous master into a builder specifically for libunwind v1.5.0. To avoid issues with automated JLL registration, it only did that version. This commit now adds a separate builder for v1.3.2, the version of libunwind currently in use by Julia. Note that to avoid said issues with registration, this commit does not refactor the other builder to use a common setup; that can be done separately to reduce duplication.
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.
As of #3804, the libunwind builder builds v1.5.0. However, Julia still uses v1.3.2 (cf. JuliaLang/julia#42782). In order to fix JuliaLang/julia#41943 we'll need libunwind/libunwind#308, but that fix will also need to be backported. Thus it seems the path of least resistance is to add back the previous v1.3.2 builder (the contents of the L/LibUnwind directory prior to #3804) and create new JLL releases for both libunwind versions.