libjulia_jll: add Julia 1.9, update 1.8

JuliaPackaging · Feb 18, 2022 · 2b4cb76 · 2b4cb76
1 parent 9dc65a6
commit 2b4cb76
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 34 deletions.
diff --git a/L/libjulia/build_tarballs.jl b/L/libjulia/build_tarballs.jl
@@ -1,5 +1,6 @@
 include("common.jl")
-jllversion=v"1.7.0"
+jllversion=v"1.8.0"
 build_julia(ARGS, v"1.6.3"; jllversion)
 build_julia(ARGS, v"1.7.0"; jllversion)
 build_julia(ARGS, v"1.8.0-DEV"; jllversion)
+build_julia(ARGS, v"1.9.0-DEV"; jllversion)
diff --git a/...bjulia/bundled/patches/1.8.0-DEV/0001-Don-t-set-HAVE_SSP-unconditionally-on-aarch64.patch b/...bjulia/bundled/patches/1.8.0-DEV/0001-Don-t-set-HAVE_SSP-unconditionally-on-aarch64.patch
diff --git a/L/libjulia/common.jl b/L/libjulia/common.jl
@@ -57,7 +57,13 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
 
     if version == v"1.8.0-DEV"
         sources = [
-            GitSource("https://github.com/JuliaLang/julia.git", "00646634c6a73998eaae3785eb78fea881c39502"),
+            # use last commit before building on M1 broke (see issue https://github.com/JuliaLang/julia/issues/44107)
+            GitSource("https://github.com/JuliaLang/julia.git", "76fa18281db20bde90d0534a2b08b092f165df8c"),
+            DirectorySource("./bundled"),
+        ]
+    elseif version == v"1.9.0-DEV"
+        sources = [
+            GitSource("https://github.com/JuliaLang/julia.git", "daa084971c57fa0999588fe3973c78fb2c8f88b0"),
             DirectorySource("./bundled"),
         ]
     else
@@ -142,7 +148,9 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
         elif [[ "${version}" == 1.7.* ]]; then
             LLVMLINK="-L${prefix}/lib -lLLVM-12jl"
         elif [[ "${version}" == 1.8.* ]]; then
-            LLVMLINK="-L${prefix}/lib -lLLVM-12jl"
+            LLVMLINK="-L${prefix}/lib -lLLVM-13jl"
+        elif [[ "${version}" == 1.9.* ]]; then
+            LLVMLINK="-L${prefix}/lib -lLLVM-13jl"
         else
             echo "Error, LLVM version not specified"
             exit 1
@@ -361,7 +369,10 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
         # starting with Julia 1.7, we need LLVMLibUnwind_jll
         push!(dependencies, BuildDependency(get_addable_spec("LLVMLibUnwind_jll", v"11.0.1+1")))
     elseif version.major == 1 && version.minor == 8
-        push!(dependencies, BuildDependency(get_addable_spec("LLVM_full_jll", v"12.0.1+4")))
+        push!(dependencies, BuildDependency(get_addable_spec("LLVM_full_jll", v"13.0.0+3")))
+        push!(dependencies, BuildDependency(get_addable_spec("LLVMLibUnwind_jll", v"12.0.1+0")))
+    elseif version.major == 1 && version.minor == 9
+        push!(dependencies, BuildDependency(get_addable_spec("LLVM_full_jll", v"13.0.1+0")))
         push!(dependencies, BuildDependency(get_addable_spec("LLVMLibUnwind_jll", v"12.0.1+0")))
     else
         error("Unsupported Julia version")