| 1 |
commit: 7c08fa53726b7d30ddb14525596a1ca468007fc3 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 27 20:36:32 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 27 20:36:32 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7c08fa53 |
| 7 |
|
| 8 |
sci-libs/trilinos: compilation fixes for 12.2.1 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
sci-libs/trilinos/ChangeLog | 4 ++ |
| 13 |
.../files/trilinos-12.2.1-compilation_fixes.patch | 43 ++++++++++++++++++++++ |
| 14 |
sci-libs/trilinos/trilinos-12.2.1.ebuild | 5 ++- |
| 15 |
3 files changed, 50 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog |
| 18 |
index 4957c5c..1aabfdf 100644 |
| 19 |
--- a/sci-libs/trilinos/ChangeLog |
| 20 |
+++ b/sci-libs/trilinos/ChangeLog |
| 21 |
@@ -2,6 +2,10 @@ |
| 22 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Id$ |
| 24 |
|
| 25 |
+ 27 Aug 2015; Matthias Maier <tamiko@g.o> |
| 26 |
+ +files/trilinos-12.2.1-compilation_fixes.patch, trilinos-12.2.1.ebuild: |
| 27 |
+ sci-libs/trilinos: compilation fixes for 12.2.1 |
| 28 |
+ |
| 29 |
*trilinos-12.2.1 (27 Aug 2015) |
| 30 |
|
| 31 |
27 Aug 2015; Matthias Maier <tamiko@g.o> +trilinos-12.2.1.ebuild: |
| 32 |
|
| 33 |
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 |
| 34 |
new file mode 100644 |
| 35 |
index 0000000..a77a8dc |
| 36 |
--- /dev/null |
| 37 |
+++ b/sci-libs/trilinos/files/trilinos-12.2.1-compilation_fixes.patch |
| 38 |
@@ -0,0 +1,43 @@ |
| 39 |
+diff --git a/packages/fei/test_utils/snl_fei_tester.cpp b/packages/fei/test_utils/snl_fei_tester.cpp |
| 40 |
+index 0ebfa9d..17278ee 100644 |
| 41 |
+--- a/packages/fei/test_utils/snl_fei_tester.cpp |
| 42 |
++++ b/packages/fei/test_utils/snl_fei_tester.cpp |
| 43 |
+@@ -523,7 +523,7 @@ int snl_fei_tester::save_block_node_soln(DataReader& data, fei::Vector* vec, |
| 44 |
+ FEI_OFSTREAM outfile(str.c_str()); |
| 45 |
+ |
| 46 |
+ if (!outfile || outfile.bad()) { |
| 47 |
+- fei::console_out() << "ERROR opening solution output file " << fileName << FEI_ENDL; |
| 48 |
++ fei::console_out() << "ERROR opening solution output file " << fileName.str() << FEI_ENDL; |
| 49 |
+ return(-1); |
| 50 |
+ } |
| 51 |
+ |
| 52 |
+@@ -591,7 +591,7 @@ int snl_fei_tester::save_block_elem_soln(DataReader& data, fei::Vector* vec, |
| 53 |
+ FEI_OFSTREAM outfile(str.c_str()); |
| 54 |
+ |
| 55 |
+ if (!outfile || outfile.bad()) { |
| 56 |
+- fei::console_out() << "ERROR opening solution output file " << fileName << FEI_ENDL; |
| 57 |
++ fei::console_out() << "ERROR opening solution output file " << fileName.str() << FEI_ENDL; |
| 58 |
+ return(-1); |
| 59 |
+ } |
| 60 |
+ |
| 61 |
+@@ -668,7 +668,7 @@ int snl_fei_tester::save_multiplier_soln(DataReader& data, fei::Vector* vec, |
| 62 |
+ FEI_OFSTREAM outfile(str.c_str()); |
| 63 |
+ |
| 64 |
+ if (!outfile || outfile.bad()) { |
| 65 |
+- fei::console_out() << "ERROR opening solution output file " << fileName << FEI_ENDL; |
| 66 |
++ fei::console_out() << "ERROR opening solution output file " << fileName.str() << FEI_ENDL; |
| 67 |
+ return(-1); |
| 68 |
+ } |
| 69 |
+ |
| 70 |
+diff --git a/packages/ifpack/src/Ifpack_Hypre.cpp b/packages/ifpack/src/Ifpack_Hypre.cpp |
| 71 |
+index ea6ba35..26a1281 100644 |
| 72 |
+--- a/packages/ifpack/src/Ifpack_Hypre.cpp |
| 73 |
++++ b/packages/ifpack/src/Ifpack_Hypre.cpp |
| 74 |
+@@ -51,6 +51,7 @@ |
| 75 |
+ |
| 76 |
+ using Teuchos::RCP; |
| 77 |
+ using Teuchos::rcp; |
| 78 |
++using std::endl; |
| 79 |
+ |
| 80 |
+ Ifpack_Hypre::Ifpack_Hypre(Epetra_RowMatrix* A): |
| 81 |
+ A_(rcp(A,false)), |
| 82 |
|
| 83 |
diff --git a/sci-libs/trilinos/trilinos-12.2.1.ebuild b/sci-libs/trilinos/trilinos-12.2.1.ebuild |
| 84 |
index b090b96..5862e73 100644 |
| 85 |
--- a/sci-libs/trilinos/trilinos-12.2.1.ebuild |
| 86 |
+++ b/sci-libs/trilinos/trilinos-12.2.1.ebuild |
| 87 |
@@ -82,8 +82,9 @@ trilinos_enable() { |
| 88 |
} |
| 89 |
|
| 90 |
src_prepare() { |
| 91 |
- epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch |
| 92 |
- epatch "${FILESDIR}"/${PN}-12.0.1-fix_install_paths_for_destdir.patch |
| 93 |
+ epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \ |
| 94 |
+ "${FILESDIR}"/${PN}-12.0.1-fix_install_paths_for_destdir.patch \ |
| 95 |
+ "${FILESDIR}"/${P}-compilation_fixes.patch |
| 96 |
} |
| 97 |
|
| 98 |
src_configure() { |
Archives