From 22cb3815fe2df7090eb735cc472a7d37c3beb8ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Aum=C3=BCller?= Date: Thu, 14 Mar 2024 18:59:45 +0100 Subject: [PATCH] ispc: add v1.22.0 & v1.23.0 (#43159) * ispc: add v1.22.0 & v1.23.0 * ispc: fix build on macos apply upstream patch * ispc: demote llvm to just a build dependency still builds fine --- .../repos/builtin/packages/ispc/package.py | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/var/spack/repos/builtin/packages/ispc/package.py b/var/spack/repos/builtin/packages/ispc/package.py index bae4d9ceb5..b2a51bed81 100644 --- a/var/spack/repos/builtin/packages/ispc/package.py +++ b/var/spack/repos/builtin/packages/ispc/package.py @@ -27,6 +27,8 @@ class Ispc(CMakePackage): license("BSD-3-Clause") version("main", branch="main") + version("1.23.0", sha256="e268eabed9a9021b4402725ed1c120b8eca776ee4aaf50ddeb0e4adaadda05f9") + version("1.22.0", sha256="1f115eeed7df5028c19c9b256887949ca88c29c146f641b031d8e080297f5acd") version("1.21.1", sha256="99bbb1d1f15bc4433d6a63b5bb35b321af3e3af753c3b28a61850d1748e8a89f") version("1.21.0", sha256="023782f721bfb5893bac24bc2153a8214c916be82c290bf63a3ec6678949b5ef") version("1.20.0", sha256="8bd30ded7f96859451ead1cecf6f58ac8e937288fe0e5b98c56f6eba4be370b4") @@ -47,19 +49,19 @@ class Ispc(CMakePackage): depends_on("ncurses", type="link") depends_on("zlib-api", type="link") depends_on("tbb", type="link", when="platform=linux @1.20:") - depends_on("llvm+clang") - depends_on("llvm libcxx=none", when="platform=darwin") - depends_on("llvm targets=arm,aarch64", when="target=arm:") - depends_on("llvm targets=arm,aarch64", when="target=aarch64:") - depends_on("llvm@:17", when="@:1.21") - depends_on("llvm@:15", when="@:1.20") - depends_on("llvm@:14", when="@:1.18") - depends_on("llvm@:12", when="@:1.16") - depends_on("llvm@:11", when="@:1.15") - depends_on("llvm@:10", when="@:1.14") - depends_on("llvm@13:", when="@1.19:") - depends_on("llvm@11:", when="@1.16:") - depends_on("llvm@10:", when="@1.13:") + depends_on("llvm+clang", type="build") + depends_on("llvm libcxx=none", when="platform=darwin", type="build") + depends_on("llvm targets=arm,aarch64", when="target=arm:", type="build") + depends_on("llvm targets=arm,aarch64", when="target=aarch64:", type="build") + depends_on("llvm@:17", when="@:1.23", type="build") + depends_on("llvm@:15", when="@:1.20", type="build") + depends_on("llvm@:14", when="@:1.18", type="build") + depends_on("llvm@:12", when="@:1.16", type="build") + depends_on("llvm@:11", when="@:1.15", type="build") + depends_on("llvm@:10", when="@:1.14", type="build") + depends_on("llvm@13:", when="@1.19:", type="build") + depends_on("llvm@11:", when="@1.16:", type="build") + depends_on("llvm@10:", when="@1.13:", type="build") patch( "don-t-assume-that-ncurses-zlib-are-system-libraries.patch", @@ -73,6 +75,13 @@ class Ispc(CMakePackage): sha256="d3ccf547d3ba59779fd375e10417a436318f2200d160febb9f830a26f0daefdc", ) + # Fix build with Apple clang 15 + patch( + "https://github.com/ispc/ispc/pull/2785.patch?full_index=1", + when="@1.22:1.23.0", + sha256="f6a413bf86e49d520d23df7132004d1f09caa512187f369549a4a783859fbc41", + ) + # Fix library lookup for NCurses in CMake patch( "https://patch-diff.githubusercontent.com/raw/ispc/ispc/pull/2638.patch?full_index=1",