zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Trilinos 12.18.1 build when using Apple Clang 8.0.0

Browse Source
This commit is contained in:
Jean-Paul Pelteret
2020-02-02 21:06:53 +01:00
committed by Peter Scheibel
parent 7fc908e0e1
commit 7217592c24
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
var/spack/repos/builtin/packages/trilinos/fix_clang_errors_12_18_1.patch Normal file
View File

@@ -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)

1
var/spack/repos/builtin/packages/trilinos/package.py
View File

@@ -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"