diff options
| author | Jean-Paul Pelteret <jppelteret@gmail.com> | 2020-02-02 21:06:53 +0100 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2020-02-27 18:22:09 -0800 |
| commit | 7217592c246ff6c9d0b91f22deecacc41949cef0 (patch) | |
| tree | f6d012f4797f64251b17096fe0133bc6ba598eb5 | |
| parent | 7fc908e0e1571af2bd59ad823905242ee44f12ae (diff) | |
| download | spack-7217592c246ff6c9d0b91f22deecacc41949cef0.tar.gz spack-7217592c246ff6c9d0b91f22deecacc41949cef0.tar.bz2 spack-7217592c246ff6c9d0b91f22deecacc41949cef0.tar.xz spack-7217592c246ff6c9d0b91f22deecacc41949cef0.zip | |
Fix Trilinos 12.18.1 build when using Apple Clang 8.0.0
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/fix_clang_errors_12_18_1.patch | 39 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/fix_clang_errors_12_18_1.patch b/var/spack/repos/builtin/packages/trilinos/fix_clang_errors_12_18_1.patch new file mode 100644 index 0000000000..6da3f4314d --- /dev/null +++ b/var/spack/repos/builtin/packages/trilinos/fix_clang_errors_12_18_1.patch @@ -0,0 +1,39 @@ +From 01b88601a85691da73042089778db6db5bf6cf01 Mon Sep 17 00:00:00 2001 +From: Jean-Paul Pelteret <jppelteret@gmail.com> +Date: Sat, 1 Feb 2020 05:48:48 +0100 +Subject: [PATCH] Fix Clang 8.0.0 compiler errors 12.18.1 + +--- + packages/belos/tpetra/src/solvers/Belos_Tpetra_Krylov.hpp | 2 +- + packages/muelu/src/Interface/MueLu_ParameterListUtils.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/packages/belos/tpetra/src/solvers/Belos_Tpetra_Krylov.hpp b/packages/belos/tpetra/src/solvers/Belos_Tpetra_Krylov.hpp +index d4f72bc..302dfc2 100644 +--- a/packages/belos/tpetra/src/solvers/Belos_Tpetra_Krylov.hpp ++++ b/packages/belos/tpetra/src/solvers/Belos_Tpetra_Krylov.hpp +@@ -126,7 +126,7 @@ public: + virtual void + getDefaultParameters (Teuchos::ParameterList& params) const + { +- const SolverInput<SC> input; ++ const SolverInput<SC> input{}; + const int verbosity = 0; + const std::string implResScal = input.needToScale ? + "Norm of Preconditioned Initial Residual" : "None"; // ??? +diff --git a/packages/muelu/src/Interface/MueLu_ParameterListUtils.cpp b/packages/muelu/src/Interface/MueLu_ParameterListUtils.cpp +index 051a2df..a703aff 100644 +--- a/packages/muelu/src/Interface/MueLu_ParameterListUtils.cpp ++++ b/packages/muelu/src/Interface/MueLu_ParameterListUtils.cpp +@@ -143,7 +143,7 @@ namespace MueLu { + + // Usage: GetMLSubList(paramList, "smoother", 2); + const Teuchos::ParameterList & GetMLSubList(const Teuchos::ParameterList & paramList, const std::string & type, int levelID) { +- static const Teuchos::ParameterList emptyParamList; ++ static const Teuchos::ParameterList emptyParamList{}; + + char levelChar[11]; + sprintf(levelChar, "(level %d)", levelID); +-- +2.10.1 (Apple Git-78) + diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index e15d229657..ba5ce27562 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -361,6 +361,7 @@ class Trilinos(CMakePackage): 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('fix_clang_errors_12_18_1.patch', when='@12.18.1%clang') def url_for_version(self, version): url = "https://github.com/trilinos/Trilinos/archive/trilinos-release-{0}.tar.gz" |