From 2bf85c763f89ec263a170624a7bb71b8ff5d727e Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 18 Feb 2022 16:27:42 +0100 Subject: [PATCH] WIP --- L/libjulia/common.jl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/L/libjulia/common.jl b/L/libjulia/common.jl index 9a526b9ad94..a81ac462af3 100644 --- a/L/libjulia/common.jl +++ b/L/libjulia/common.jl @@ -40,8 +40,6 @@ function libjulia_platforms(julia_version) return platforms end -libjulia_platforms() = vcat(libjulia_platforms(v"1.6.0"), libjulia_platforms(v"1.7.0")) - # Collection of sources required to build Julia function build_julia(ARGS, version::VersionNumber; jllversion=version) name = "libjulia" @@ -65,6 +63,14 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version) ArchiveSource("https://github.com/JuliaLang/julia/releases/download/v$(version)/julia-$(version).tar.gz", checksums[version]), DirectorySource("./bundled"), ] + + if version == v"1.6.3" + # WORKAROUND + push!(sources, ArchiveSource("https://github.com/JuliaBinaryWrappers/LibOSXUnwind_jll.jl/releases/download/LibOSXUnwind-v0.0.7%2B0/LibOSXUnwind.v0.0.7.x86_64-apple-darwin.tar.gz", + "e2ea6ecae13c0f2666d1b3020098feeab92affae1614f6b2a992dde0af88ec2f", + unpack_target="LibOSXUnwind_jll")) + end + end # Bash recipe for building across all platforms @@ -321,7 +327,7 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version) ] if version < v"1.5.1" push!(dependencies, Dependency("LibOSXUnwind_jll", compat="0.0.5")) - elseif version < v"1.7" + elseif version < v"1.6" push!(dependencies, BuildDependency(PackageSpec(; name="LibOSXUnwind_jll", version=v"0.0.6"))) end