diff --git a/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@14/build_tarballs.jl b/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@14/build_tarballs.jl deleted file mode 100644 index c098ba62d9b..00000000000 --- a/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@14/build_tarballs.jl +++ /dev/null @@ -1,15 +0,0 @@ -version = v"14.0" -llvm_version = v"14.0.6" -include("../common.jl") - -# Collection of sources required to build attr -sources = [GitSource(repo, "62f5b09b11b1da42274371b1f7535f6f2ab11485")] - -# Dependencies that must be installed before this package can be built -dependencies = [ - BuildDependency(PackageSpec(name="LLVM_full_jll", version=llvm_version)), -] - -# Build the tarballs. -build_tarballs(ARGS, name, version, sources, get_script(llvm_version), platforms, products, - dependencies; preferred_gcc_version=v"10", julia_compat="1.6") diff --git a/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@15/build_tarballs.jl b/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@15/build_tarballs.jl index 58d8bb8035f..c8cff03c28c 100644 --- a/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@15/build_tarballs.jl +++ b/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@15/build_tarballs.jl @@ -3,7 +3,7 @@ llvm_version = v"15.0.7" include("../common.jl") # Collection of sources required to build attr -sources = [GitSource(repo, "0f9ad6622b1bf308facf35073c91c738b34081ba")] +sources = [GitSource(repo, "1e170e22f65d6bf01e6c592f8ed845dcceb69bea")] # Dependencies that must be installed before this package can be built dependencies = [ diff --git a/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@16/build_tarballs.jl b/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@16/build_tarballs.jl index 7d713e1442c..73b0876858b 100644 --- a/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@16/build_tarballs.jl +++ b/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@16/build_tarballs.jl @@ -3,7 +3,7 @@ llvm_version = v"16.0.6" include("../common.jl") # Collection of sources required to build attr -sources = [GitSource(repo, "0b107dbf421593ed6f201ea2b7976e9456bc6bd3")] +sources = [GitSource(repo, "1f9e0e36d8917cece7593771304d8db0bcd9f614")] # Dependencies that must be installed before this package can be built dependencies = [ diff --git a/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@17/build_tarballs.jl b/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@17/build_tarballs.jl index b0c56243b13..391e22b6bbb 100644 --- a/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@17/build_tarballs.jl +++ b/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@17/build_tarballs.jl @@ -3,7 +3,7 @@ llvm_version = v"17.0.6" include("../common.jl") # Collection of sources required to build attr -sources = [GitSource(repo, "38e0a0dda82ab2807d7064b34bd7e81034ef3837")] +sources = [GitSource(repo, "3aa5bcd0c60a2c05b3a045339b2ef001465961ec")] # Dependencies that must be installed before this package can be built dependencies = [ diff --git a/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@13/build_tarballs.jl b/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@18/build_tarballs.jl similarity index 79% rename from S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@13/build_tarballs.jl rename to S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@18/build_tarballs.jl index 6ec1328e76c..b23c40f9560 100644 --- a/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@13/build_tarballs.jl +++ b/S/SPIRV_LLVM_Translator/SPIRV_LLVM_Translator@18/build_tarballs.jl @@ -1,9 +1,9 @@ -version = v"13.0" -llvm_version = v"13.0.1" +version = v"18.0" +llvm_version = v"18.1.7" include("../common.jl") # Collection of sources required to build attr -sources = [GitSource(repo, "093cf279cad6f12bb22abf0a94eae9aca938aaea")] +sources = [GitSource(repo, "242df2cb83e2322b456990fb0ca3e30bd9209ed0")] # Dependencies that must be installed before this package can be built dependencies = [ diff --git a/S/SPIRV_LLVM_Translator/common.jl b/S/SPIRV_LLVM_Translator/common.jl index ade9637b19a..e5816012cd3 100644 --- a/S/SPIRV_LLVM_Translator/common.jl +++ b/S/SPIRV_LLVM_Translator/common.jl @@ -19,6 +19,9 @@ if llvm_version >= v"15" filter!(p -> !(arch(p) == "i686" && libc(p) == "musl"), platforms) end +# missing LLVM_full +filter!(p -> !(Sys.isfreebsd(p) && arch(p) == "aarch64"), platforms) + # Bash recipe for building across all platforms get_script(llvm_version) = raw""" cd SPIRV-LLVM-Translator diff --git a/S/SPIRV_LLVM_Translator_unified/build_tarballs.jl b/S/SPIRV_LLVM_Translator_unified/build_tarballs.jl index 4b234304ec9..05a34c9a23e 100644 --- a/S/SPIRV_LLVM_Translator_unified/build_tarballs.jl +++ b/S/SPIRV_LLVM_Translator_unified/build_tarballs.jl @@ -7,23 +7,23 @@ include(joinpath(YGGDRASIL_DIR, "platforms", "llvm.jl")) name = "SPIRV_LLVM_Translator_unified" repo = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git" -version = v"0.5" +version = v"0.6" -llvm_versions = [v"13.0.1", v"14.0.6", v"15.0.7", v"16.0.6", v"17.0.6"] +llvm_versions = [v"15.0.7", v"16.0.6", v"17.0.6", v"18.1.7"] # Collection of sources required to build SPIRV_LLVM_Translator sources = Dict( - v"13.0.1" => [GitSource(repo, "093cf279cad6f12bb22abf0a94eae9aca938aaea")], - v"14.0.6" => [GitSource(repo, "62f5b09b11b1da42274371b1f7535f6f2ab11485")], - v"15.0.7" => [GitSource(repo, "0f9ad6622b1bf308facf35073c91c738b34081ba")], - v"16.0.6" => [GitSource(repo, "0b107dbf421593ed6f201ea2b7976e9456bc6bd3")], - v"17.0.6" => [GitSource(repo, "38e0a0dda82ab2807d7064b34bd7e81034ef3837")], + v"15.0.7" => [GitSource(repo, "1e170e22f65d6bf01e6c592f8ed845dcceb69bea")], + v"16.0.6" => [GitSource(repo, "1f9e0e36d8917cece7593771304d8db0bcd9f614")], + v"17.0.6" => [GitSource(repo, "3aa5bcd0c60a2c05b3a045339b2ef001465961ec")], + v"18.1.7" => [GitSource(repo, "242df2cb83e2322b456990fb0ca3e30bd9209ed0")], ) # These are the platforms we will build for by default, unless further # platforms are passed in on the command line platforms = expand_cxxstring_abis(supported_platforms(; experimental=true)) -filter!(p -> libc(p) != "musl", platforms) # LLVM_full+asserts isn't available for musl +filter!(p -> libc(p) != "musl", platforms) # missing LLVM_full+asserts +filter!(p -> !(Sys.isfreebsd(p) && arch(p) == "aarch64"), platforms) # missing LLVM_full # Bash recipe for building across all platforms get_script(llvm_version) = raw"""