From 7f2fd50d209be3d54673e45b148c63d5929b11bc Mon Sep 17 00:00:00 2001 From: Jonas Thies <16190001+jthies@users.noreply.github.com> Date: Tue, 5 Oct 2021 10:33:41 +0200 Subject: phist: add a patch for the case +host arch=ppc64le (#26216) --- var/spack/repos/builtin/packages/phist/package.py | 4 +++- var/spack/repos/builtin/packages/phist/ppc64_sse.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/phist/ppc64_sse.patch (limited to 'var/spack') diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index 0027e2ba4c..87ce1d2ae3 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -103,8 +103,10 @@ 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') patch('update_tpetra_gotypes.patch', when='@:1.8') - patch('sbang.patch', when='+fortran') # ###################### Dependencies ########################## diff --git a/var/spack/repos/builtin/packages/phist/ppc64_sse.patch b/var/spack/repos/builtin/packages/phist/ppc64_sse.patch new file mode 100644 index 0000000000..d4b59c8fe2 --- /dev/null +++ b/var/spack/repos/builtin/packages/phist/ppc64_sse.patch @@ -0,0 +1,12 @@ +--- a/cmake/SetHostCompileFlag.cmake ++++ b/cmake/SetHostCompileFlag.cmake +@@ -45,3 +45,9 @@ cmake_pop_check_state() # Recover variables + foreach (LANG C CXX Fortran) + set(CMAKE_${LANG}_FLAGS "${CMAKE_${LANG}_FLAGS} ${${LANG}_ARCH_FLAG}") + endforeach() ++ ++if(PHIST_HOST_OPTIMIZE) ++ if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") ++ add_definitions(-DNO_WARN_X86_INTRINSICS) ++ endif() ++endif() -- cgit v1.2.3-70-g09d2