From 029b47ad7262908bb3a5b86c352f362705159b1d Mon Sep 17 00:00:00 2001 From: Martin Aumüller Date: Wed, 20 Oct 2021 16:41:18 +0200 Subject: embree: add checksums for 3.12.2 & 3.13.1 (#26675) Includes fix for for dependency ispc: fix build if cc -m32 is not possible Co-authored-by: Bernhard Kaindl --- var/spack/repos/builtin/packages/embree/package.py | 2 ++ var/spack/repos/builtin/packages/ispc/package.py | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/var/spack/repos/builtin/packages/embree/package.py b/var/spack/repos/builtin/packages/embree/package.py index b6c6c0f7f3..38880463db 100644 --- a/var/spack/repos/builtin/packages/embree/package.py +++ b/var/spack/repos/builtin/packages/embree/package.py @@ -13,7 +13,9 @@ class Embree(CMakePackage): url = "https://github.com/embree/embree/archive/v3.7.0.tar.gz" maintainers = ['aumuell'] + version('3.13.1', sha256='00dbd852f19ae2b95f5106dd055ca4b304486436ced0ccf842aec4e38a4df425') version('3.13.0', sha256='4d86a69508a7e2eb8710d571096ad024b5174834b84454a8020d3a910af46f4f') + version('3.12.2', sha256='22a527622497e07970e733f753cc9c10b2bd82c3b17964e4f71a5fd2cdfca210') version('3.12.1', sha256='0c9e760b06e178197dd29c9a54f08ff7b184b0487b5ba8b8be058e219e23336e') version('3.12.0', sha256='f3646977c45a9ece1fb0cfe107567adcc645b1c77c27b36572d0aa98b888190c') version('3.11.0', sha256='2ccc365c00af4389aecc928135270aba7488e761c09d7ebbf1bf3e62731b147d') diff --git a/var/spack/repos/builtin/packages/ispc/package.py b/var/spack/repos/builtin/packages/ispc/package.py index 41f4bf47e9..b42f5c9371 100644 --- a/var/spack/repos/builtin/packages/ispc/package.py +++ b/var/spack/repos/builtin/packages/ispc/package.py @@ -51,6 +51,14 @@ class Ispc(CMakePackage): patch('fix-linking-against-llvm-10.patch', when='@1.13.0:1.13', sha256='d3ccf547d3ba59779fd375e10417a436318f2200d160febb9f830a26f0daefdc') + def patch(self): + with open("check-m32.c", "w") as f: + f.write('#include ') + try: + Executable(self.compiler.cc)('-m32', '-shared', 'check-m32.c', error=str) + except ProcessError: + filter_file('bit 32 64', 'bit 64', 'cmake/GenerateBuiltins.cmake') + def cmake_args(self): args = [] args.append('-DARM_ENABLED=FALSE') -- cgit v1.2.3-60-g2f50