Skip to content

Commit

Permalink
Redo libjulia_jll 1.5 with fixed libunwind linkage
Browse files Browse the repository at this point in the history
Also upgrade to Julia 1.5.3 to fix macOS compile error related to
rec_backtrace_ctx.
  • Loading branch information
fingolfin committed Nov 24, 2020
1 parent 1bf7f5a commit 4b18ed7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions L/libjulia/common.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function build_julia(version)
checksums = Dict(
v"1.3.1" => "3d9037d281fb41ad67b443f42d8a8e400b016068d142d6fafce1952253ae93db",
v"1.4.2" => "76a94e06e68fb99822e0876a37c2ed3873e9061e895ab826fd8c9fc7e2f52795",
v"1.5.1" => "1f138205772eb1e565f1d7ccd6f237be8a4d18713a3466e3b8d3a6aad6483fd9",
v"1.5.3" => "be19630383047783d6f314ebe0bf5e3f95f82b0c203606ec636dced405aab1fe",
)
sources = [
ArchiveSource("https://github.com/JuliaLang/julia/releases/download/v$(version)/julia-$(version).tar.gz", checksums[version]),
Expand Down Expand Up @@ -87,7 +87,7 @@ function build_julia(version)
cat << EOM >Make.user
USE_SYSTEM_LLVM=1
# USE_SYSTEM_LIBUNWIND=1
USE_SYSTEM_LIBUNWIND=1
USE_SYSTEM_PCRE=1
USE_SYSTEM_OPENLIBM=1
Expand Down Expand Up @@ -218,8 +218,8 @@ function build_julia(version)

# Dependencies that must be installed before this package can be built/used
dependencies = [
# Dependency("LibUnwind_jll"),
# Dependency("LibOSXUnwind_jll"),
Dependency("LibUnwind_jll"),
Dependency("LibOSXUnwind_jll"),
Dependency(PackageSpec(name="PCRE2_jll", version=v"10.31")),
Dependency("OpenLibm_jll"),
Dependency("dSFMT_jll"),
Expand Down
2 changes: 1 addition & 1 deletion L/libjulia/[email protected]/build_tarballs.jl
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include("../common.jl")
build_julia(v"1.5.1")
build_julia(v"1.5.3")

0 comments on commit 4b18ed7

Please sign in to comment.