From a537d7b56e32f04e640b34d5d5811ca48084141d Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Sat, 8 Sep 2018 23:51:16 -0500 Subject: trilinos: disable xlf_tpetra.patch for trilinos@develop (#9193) This patch does not apply cleanly anymore and breaks clang/Mac builds balay@asterix /home/balay/git-repo/github/trilinos (develop=) $ patch -Np1 < /home/balay/git-repo/github/spack/var/spack/repos/builtin/packages/trilinos/xlf_tpetra.patch can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- a/packages/tpetra/core/src/Tpetra_Details_libGemm.cpp |+++ b/packages/tpetra/core/src/Tpetra_Details_libGemm.cpp -------------------------- File to patch: --- var/spack/repos/builtin/packages/trilinos/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 87a8bf1e91..d43ad7999e 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -314,9 +314,9 @@ class Trilinos(CMakePackage): patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl') patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %xl_r') patch('xlf_seacas.patch', when='@12.10.1:12.12.1 %clang') - patch('xlf_tpetra.patch', when='@12.12.1:%xl') - patch('xlf_tpetra.patch', when='@12.12.1:%xl_r') - patch('xlf_tpetra.patch', when='@12.12.1:%clang') + patch('xlf_tpetra.patch', when='@12.12.1%xl') + patch('xlf_tpetra.patch', when='@12.12.1%xl_r') + patch('xlf_tpetra.patch', when='@12.12.1%clang') def url_for_version(self, version): url = "https://github.com/trilinos/Trilinos/archive/trilinos-release-{0}.tar.gz" -- cgit v1.2.3-70-g09d2