Fix filtering of armv7l platforms in JLL wrappers #1
Conversation
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
Contributor
|
Still no luck, I get the same error: It seems that MbedTLS_jll looks for these wrapper files: The first file does not exists (but diff --git a/src/MbedTLS_jll.jl b/src/MbedTLS_jll.jl
index fd8844f..716cefb 100644
--- a/src/MbedTLS_jll.jl
+++ b/src/MbedTLS_jll.jl
@@ -34,7 +34,7 @@ artifacts = Pkg.Artifacts.load_artifacts_toml(artifacts_toml; pkg_uuid=UUID("c8f
platforms = [Pkg.Artifacts.unpack_platform(e, "MbedTLS", artifacts_toml) for e in artifacts["MbedTLS"]]
# Filter platforms based on what wrappers we've generated on-disk
-filter!(p -> isfile(joinpath(@__DIR__, "wrappers", replace(triplet(p), "arm-" => "armv7l-") * ".jl")), platforms)
+filter!(p -> isfile(joinpath(@__DIR__, "wrappers", replace(triplet(p), "armv7l-" => "arm-") * ".jl")), platforms)
# From the available options, choose the best platform
best_platform = select_platform(Dict(p => triplet(p) for p in platforms))
@@ -44,7 +44,7 @@ if best_platform === nothing
@debug("Unable to load MbedTLS; unsupported platform $(triplet(platform_key_abi()))")
else
# Load the appropriate wrapper
- include(joinpath(@__DIR__, "wrappers", "$(best_platform).jl"))
+ include(joinpath(@__DIR__, "wrappers", "$(replace(best_platform,"armv7l-" => "arm-")).jl"))
end
end # module MbedTLS_jllThe following tests now works: julia> using MbedTLS, MbedTLS_jll; MbedTLS.SSLConfig() julia> MbedTLS_jll.libmbedtls Alternatively, it also work by renaming (or copying) file wrapper files: |
Contributor
Author
|
Mind doing a PR? |
Contributor
|
Sure, I made the PR here: |
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.
@Alexander-Barth could you please checkout this branch and tell me if this works for you? JuliaPackaging/Yggdrasil#887 will be blocked for a while because of a bug in BinaryBuilder, so directly patching the wrapper may be the fastest thing to do.