Skip to content

Commit 2b4cb76

Browse files
committed
libjulia_jll: add Julia 1.9, update 1.8
1 parent 9dc65a6 commit 2b4cb76

3 files changed

Lines changed: 16 additions & 34 deletions

File tree

L/libjulia/build_tarballs.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
include("common.jl")
2-
jllversion=v"1.7.0"
2+
jllversion=v"1.8.0"
33
build_julia(ARGS, v"1.6.3"; jllversion)
44
build_julia(ARGS, v"1.7.0"; jllversion)
55
build_julia(ARGS, v"1.8.0-DEV"; jllversion)
6+
build_julia(ARGS, v"1.9.0-DEV"; jllversion)

L/libjulia/bundled/patches/1.8.0-DEV/0001-Don-t-set-HAVE_SSP-unconditionally-on-aarch64.patch

Lines changed: 0 additions & 30 deletions
This file was deleted.

L/libjulia/common.jl

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,13 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
5757

5858
if version == v"1.8.0-DEV"
5959
sources = [
60-
GitSource("https://github.com/JuliaLang/julia.git", "00646634c6a73998eaae3785eb78fea881c39502"),
60+
# use last commit before building on M1 broke (see issue https://github.com/JuliaLang/julia/issues/44107)
61+
GitSource("https://github.com/JuliaLang/julia.git", "76fa18281db20bde90d0534a2b08b092f165df8c"),
62+
DirectorySource("./bundled"),
63+
]
64+
elseif version == v"1.9.0-DEV"
65+
sources = [
66+
GitSource("https://github.com/JuliaLang/julia.git", "daa084971c57fa0999588fe3973c78fb2c8f88b0"),
6167
DirectorySource("./bundled"),
6268
]
6369
else
@@ -142,7 +148,9 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
142148
elif [[ "${version}" == 1.7.* ]]; then
143149
LLVMLINK="-L${prefix}/lib -lLLVM-12jl"
144150
elif [[ "${version}" == 1.8.* ]]; then
145-
LLVMLINK="-L${prefix}/lib -lLLVM-12jl"
151+
LLVMLINK="-L${prefix}/lib -lLLVM-13jl"
152+
elif [[ "${version}" == 1.9.* ]]; then
153+
LLVMLINK="-L${prefix}/lib -lLLVM-13jl"
146154
else
147155
echo "Error, LLVM version not specified"
148156
exit 1
@@ -361,7 +369,10 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
361369
# starting with Julia 1.7, we need LLVMLibUnwind_jll
362370
push!(dependencies, BuildDependency(get_addable_spec("LLVMLibUnwind_jll", v"11.0.1+1")))
363371
elseif version.major == 1 && version.minor == 8
364-
push!(dependencies, BuildDependency(get_addable_spec("LLVM_full_jll", v"12.0.1+4")))
372+
push!(dependencies, BuildDependency(get_addable_spec("LLVM_full_jll", v"13.0.0+3")))
373+
push!(dependencies, BuildDependency(get_addable_spec("LLVMLibUnwind_jll", v"12.0.1+0")))
374+
elseif version.major == 1 && version.minor == 9
375+
push!(dependencies, BuildDependency(get_addable_spec("LLVM_full_jll", v"13.0.1+0")))
365376
push!(dependencies, BuildDependency(get_addable_spec("LLVMLibUnwind_jll", v"12.0.1+0")))
366377
else
367378
error("Unsupported Julia version")

0 commit comments

Comments
 (0)