commit: 7c08fa53726b7d30ddb14525596a1ca468007fc3 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Thu Aug 27 20:36:32 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Thu Aug 27 20:36:32 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7c08fa53
sci-libs/trilinos: compilation fixes for 12.2.1 Package-Manager: portage-2.2.20.1 sci-libs/trilinos/ChangeLog | 4 ++ .../files/trilinos-12.2.1-compilation_fixes.patch | 43 ++++++++++++++++++++++ sci-libs/trilinos/trilinos-12.2.1.ebuild | 5 ++- 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog index 4957c5c..1aabfdf 100644 --- a/sci-libs/trilinos/ChangeLog +++ b/sci-libs/trilinos/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 27 Aug 2015; Matthias Maier <[email protected]> + +files/trilinos-12.2.1-compilation_fixes.patch, trilinos-12.2.1.ebuild: + sci-libs/trilinos: compilation fixes for 12.2.1 + *trilinos-12.2.1 (27 Aug 2015) 27 Aug 2015; Matthias Maier <[email protected]> +trilinos-12.2.1.ebuild: diff --git a/sci-libs/trilinos/files/trilinos-12.2.1-compilation_fixes.patch b/sci-libs/trilinos/files/trilinos-12.2.1-compilation_fixes.patch new file mode 100644 index 0000000..a77a8dc --- /dev/null +++ b/sci-libs/trilinos/files/trilinos-12.2.1-compilation_fixes.patch @@ -0,0 +1,43 @@ +diff --git a/packages/fei/test_utils/snl_fei_tester.cpp b/packages/fei/test_utils/snl_fei_tester.cpp +index 0ebfa9d..17278ee 100644 +--- a/packages/fei/test_utils/snl_fei_tester.cpp ++++ b/packages/fei/test_utils/snl_fei_tester.cpp +@@ -523,7 +523,7 @@ int snl_fei_tester::save_block_node_soln(DataReader& data, fei::Vector* vec, + FEI_OFSTREAM outfile(str.c_str()); + + if (!outfile || outfile.bad()) { +- fei::console_out() << "ERROR opening solution output file " << fileName << FEI_ENDL; ++ fei::console_out() << "ERROR opening solution output file " << fileName.str() << FEI_ENDL; + return(-1); + } + +@@ -591,7 +591,7 @@ int snl_fei_tester::save_block_elem_soln(DataReader& data, fei::Vector* vec, + FEI_OFSTREAM outfile(str.c_str()); + + if (!outfile || outfile.bad()) { +- fei::console_out() << "ERROR opening solution output file " << fileName << FEI_ENDL; ++ fei::console_out() << "ERROR opening solution output file " << fileName.str() << FEI_ENDL; + return(-1); + } + +@@ -668,7 +668,7 @@ int snl_fei_tester::save_multiplier_soln(DataReader& data, fei::Vector* vec, + FEI_OFSTREAM outfile(str.c_str()); + + if (!outfile || outfile.bad()) { +- fei::console_out() << "ERROR opening solution output file " << fileName << FEI_ENDL; ++ fei::console_out() << "ERROR opening solution output file " << fileName.str() << FEI_ENDL; + return(-1); + } + +diff --git a/packages/ifpack/src/Ifpack_Hypre.cpp b/packages/ifpack/src/Ifpack_Hypre.cpp +index ea6ba35..26a1281 100644 +--- a/packages/ifpack/src/Ifpack_Hypre.cpp ++++ b/packages/ifpack/src/Ifpack_Hypre.cpp +@@ -51,6 +51,7 @@ + + using Teuchos::RCP; + using Teuchos::rcp; ++using std::endl; + + Ifpack_Hypre::Ifpack_Hypre(Epetra_RowMatrix* A): + A_(rcp(A,false)), diff --git a/sci-libs/trilinos/trilinos-12.2.1.ebuild b/sci-libs/trilinos/trilinos-12.2.1.ebuild index b090b96..5862e73 100644 --- a/sci-libs/trilinos/trilinos-12.2.1.ebuild +++ b/sci-libs/trilinos/trilinos-12.2.1.ebuild @@ -82,8 +82,9 @@ trilinos_enable() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch - epatch "${FILESDIR}"/${PN}-12.0.1-fix_install_paths_for_destdir.patch + epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \ + "${FILESDIR}"/${PN}-12.0.1-fix_install_paths_for_destdir.patch \ + "${FILESDIR}"/${P}-compilation_fixes.patch } src_configure() {
