commit: 9aa67941bf580f2ea9d2e733d82c941d1847b9d0
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 14:57:28 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 14:57:28 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=9aa67941
sci-libs/trilinos: fix installation
Package-Manager: Portage-2.3.0, Repoman-2.3.1
.../trilinos-12.10.1-fix_install_paths_for_destdir-2.patch | 10 ++++++++++
sci-libs/trilinos/trilinos-12.10.1.ebuild | 5 +++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git
a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch
b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch
new file mode 100644
index 0000000..52ddc76
--- /dev/null
+++
b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch
@@ -0,0 +1,10 @@
+diff --git a/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
b/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
+index 8f9fa8f..e57d25f 100644
+--- a/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
++++ b/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
+@@ -71,4 +71,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
diff --git a/sci-libs/trilinos/trilinos-12.10.1.ebuild
b/sci-libs/trilinos/trilinos-12.10.1.ebuild
index 878ea8f..c00a3ef 100644
--- a/sci-libs/trilinos/trilinos-12.10.1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -84,7 +84,8 @@ trilinos_enable() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
- "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch
+ "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch \
+ "${FILESDIR}"/${P}-fix_install_paths_for_destdir-2.patch
}
src_configure() {
