diff options
| author | Satish Balay <balay@mcs.anl.gov> | 2018-09-08 23:51:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-08 23:51:16 -0500 |
| commit | a537d7b56e32f04e640b34d5d5811ca48084141d (patch) | |
| tree | f0425e577ec324fa792c5e48c66966e8b20c318f /var | |
| parent | 8afc630e96aca12bb47e8e85bac9f150b8e6f695 (diff) | |
| download | spack-a537d7b56e32f04e640b34d5d5811ca48084141d.tar.gz spack-a537d7b56e32f04e640b34d5d5811ca48084141d.tar.bz2 spack-a537d7b56e32f04e640b34d5d5811ca48084141d.tar.xz spack-a537d7b56e32f04e640b34d5d5811ca48084141d.zip | |
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:
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 6 |
1 files changed, 3 insertions, 3 deletions
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" |