From b771c4ea01a0ce19511dcc30d07fec5e0494146a Mon Sep 17 00:00:00 2001 From: Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> Date: Wed, 13 Oct 2021 15:20:50 +0200 Subject: phist: Fix build: ppc64_sse.patch only applies to 1.9.4 (#26704) ppc64_sse.patch can only be applied to 1.9.4: * Older releases don't have the patched file * All newer releases carry the change of the patch already. --- var/spack/repos/builtin/packages/phist/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index d0d46e12d7..448727473f 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -29,6 +29,7 @@ class Phist(CMakePackage): version('develop', branch='devel') version('master', branch='master') + version('1.9.6', sha256='98ed5ccb22bb98d5b6bf9de0c9960105473e5244978853070b9a3c44138db662') version('1.9.5', sha256='24faa3373003f185c82a658c510e36cba9acc4110eb60cbfded9de370ae9ea32') version('1.9.4', sha256='9dde3ca0480358fa0877ec8424aaee4011c5defc929219a5930388a7cdb4c8a6') version('1.9.3', sha256='3ab7157e9f535a4c8537846cb11b516271ef13f82d0f8ebb7f96626fb9ab86cf') @@ -104,9 +105,9 @@ class Phist(CMakePackage): # ###################### Patches ########################## - # resolve #22758: while SSE instructions are handled correctly, but a compile-time - # error will occur unless -DNO_WARN_X86_INTRINSICS is defined. - patch('ppc64_sse.patch', when='@1.7.4:1.9.4') + # Only applies to 1.9.4: While SSE instructions are handled correctly, + # build fails on ppc64le unless -DNO_WARN_X86_INTRINSICS is defined. + patch('ppc64_sse.patch', when='@1.9.4') patch('update_tpetra_gotypes.patch', when='@:1.8') patch('update_tpetra_gotypes.patch', when='@:1.8.99') patch('sbang.patch', when='+fortran') -- cgit v1.2.3-60-g2f50