From 8c7a540f628f78d2c4b8119a83de40a0e7b02ca8 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Mon, 10 Feb 2025 19:49:09 +0000 Subject: [PATCH 1/3] [LLVM, Clang, LLD, MLIR] Bump to v19.1.7+0 --- L/LLVM/Clang@19/build_tarballs.jl | 4 ++-- L/LLVM/Clang_unified/build_tarballs.jl | 2 +- L/LLVM/LLD@19/build_tarballs.jl | 4 ++-- L/LLVM/LLD_unified/build_tarballs.jl | 2 +- L/LLVM/LLVM@19/build_tarballs.jl | 4 ++-- L/LLVM/MLIR@19/build_tarballs.jl | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/L/LLVM/Clang@19/build_tarballs.jl b/L/LLVM/Clang@19/build_tarballs.jl index 0f3dc816fc6..d0ee74530d6 100644 --- a/L/LLVM/Clang@19/build_tarballs.jl +++ b/L/LLVM/Clang@19/build_tarballs.jl @@ -1,6 +1,6 @@ name = "Clang" -llvm_full_version = v"19.1.1+1" -libllvm_version = v"19.1.1+1" +llvm_full_version = v"19.1.7+0" +libllvm_version = v"19.1.7+0" using BinaryBuilder, Pkg using Base.BinaryPlatforms diff --git a/L/LLVM/Clang_unified/build_tarballs.jl b/L/LLVM/Clang_unified/build_tarballs.jl index 1e121b5f506..55841f91e3c 100644 --- a/L/LLVM/Clang_unified/build_tarballs.jl +++ b/L/LLVM/Clang_unified/build_tarballs.jl @@ -13,7 +13,7 @@ llvm_full_versions = [ v"16.0.6+4", v"17.0.6+5", v"18.1.7+3", - v"19.1.1+1", + v"19.1.7+0", ] augment_platform_block = """ diff --git a/L/LLVM/LLD@19/build_tarballs.jl b/L/LLVM/LLD@19/build_tarballs.jl index 4d4224e9e35..d12eea969ed 100644 --- a/L/LLVM/LLD@19/build_tarballs.jl +++ b/L/LLVM/LLD@19/build_tarballs.jl @@ -1,6 +1,6 @@ name = "LLD" -llvm_full_version = v"19.1.1+1" -libllvm_version = v"19.1.1+1" +llvm_full_version = v"19.1.7+0" +libllvm_version = v"19.1.7+0" using BinaryBuilder, Pkg using Base.BinaryPlatforms diff --git a/L/LLVM/LLD_unified/build_tarballs.jl b/L/LLVM/LLD_unified/build_tarballs.jl index b9832adc11e..0ccc4a30557 100644 --- a/L/LLVM/LLD_unified/build_tarballs.jl +++ b/L/LLVM/LLD_unified/build_tarballs.jl @@ -13,7 +13,7 @@ llvm_full_versions = [ v"16.0.6+4", v"17.0.6+5", v"18.1.7+3", - v"19.1.1+1", + v"19.1.7+0", ] augment_platform_block = """ diff --git a/L/LLVM/LLVM@19/build_tarballs.jl b/L/LLVM/LLVM@19/build_tarballs.jl index 269500d897f..45d5177e43e 100644 --- a/L/LLVM/LLVM@19/build_tarballs.jl +++ b/L/LLVM/LLVM@19/build_tarballs.jl @@ -1,6 +1,6 @@ name = "LLVM" -llvm_full_version = v"19.1.1+1" -libllvm_version = v"19.1.1+1" +llvm_full_version = v"19.1.7+0" +libllvm_version = v"19.1.7+0" using BinaryBuilder, Pkg using Base.BinaryPlatforms diff --git a/L/LLVM/MLIR@19/build_tarballs.jl b/L/LLVM/MLIR@19/build_tarballs.jl index 9140d6459f0..3c242f0925c 100644 --- a/L/LLVM/MLIR@19/build_tarballs.jl +++ b/L/LLVM/MLIR@19/build_tarballs.jl @@ -1,6 +1,6 @@ name = "MLIR" -llvm_full_version = v"19.1.1+1" -libllvm_version = v"19.1.1+1" +llvm_full_version = v"19.1.7+0" +libllvm_version = v"19.1.7+0" using BinaryBuilder, Pkg using Base.BinaryPlatforms From cef41603b6d588da552a614b029c837cbe7644f5 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Mon, 10 Feb 2025 23:09:11 +0000 Subject: [PATCH 2/3] Try excluding riscv64 --- L/LLVM/common.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/L/LLVM/common.jl b/L/LLVM/common.jl index 8c74f78ea76..25b5308c5b2 100644 --- a/L/LLVM/common.jl +++ b/L/LLVM/common.jl @@ -608,6 +608,7 @@ function configure_build(ARGS, version; experimental_platforms=false, assert=fal ] platforms = expand_cxxstring_abis(supported_platforms(; experimental=experimental_platforms)) + filter!(p->arch(p)!="riscv64", platforms) # Not supported yet, see https://github.com/JuliaPackaging/Yggdrasil/pull/10503#issuecomment-2649445132 if version >= v"15" # We don't build LLVM 15 for i686-linux-musl, see # : From ddd6b6771c57d137462491c3415d9a7c5a371225 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Mon, 10 Feb 2025 23:10:51 +0000 Subject: [PATCH 3/3] Update link and filter right function --- L/LLVM/common.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/L/LLVM/common.jl b/L/LLVM/common.jl index 25b5308c5b2..f2e9e9d9c5d 100644 --- a/L/LLVM/common.jl +++ b/L/LLVM/common.jl @@ -608,7 +608,6 @@ function configure_build(ARGS, version; experimental_platforms=false, assert=fal ] platforms = expand_cxxstring_abis(supported_platforms(; experimental=experimental_platforms)) - filter!(p->arch(p)!="riscv64", platforms) # Not supported yet, see https://github.com/JuliaPackaging/Yggdrasil/pull/10503#issuecomment-2649445132 if version >= v"15" # We don't build LLVM 15 for i686-linux-musl, see # : @@ -758,6 +757,7 @@ function configure_extraction(ARGS, LLVM_full_version, name, libLLVM_version=not end platforms = supported_platforms(; experimental=experimental_platforms) + filter!(p->arch(p)!="riscv64", platforms) # Not supported yet, see https://github.com/JuliaPackaging/BinaryBuilder.jl/issues/1366 push!(platforms, Platform("x86_64", "linux"; sanitize="memory")) if version >= v"15" # We don't build LLVM 15 for i686-linux-musl.