| 1 |
commit: aa994a77efb09f333c73168d6294d5aff2a960ee |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 25 01:51:49 2020 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 25 02:02:09 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa994a77 |
| 7 |
|
| 8 |
sci-libs/trilinos: fix DESTDIR and installation |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-libs/trilinos/Manifest | 1 + |
| 14 |
sci-libs/trilinos/trilinos-12.18.1.ebuild | 8 +++++++- |
| 15 |
2 files changed, 8 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest |
| 18 |
index 2d59d00dbf2..36e24a7c12e 100644 |
| 19 |
--- a/sci-libs/trilinos/Manifest |
| 20 |
+++ b/sci-libs/trilinos/Manifest |
| 21 |
@@ -1,3 +1,4 @@ |
| 22 |
DIST trilinos-12.14.1-patches-r0.tar.xz 6448 BLAKE2B f852a4612c400ddfb6dcecb476e0b9b2cd0f38ac9cd74fd09fc1f99ccb2588a4703f8c8514689c81d23aa218aff3cdcbe9b5205becea8936723d6e339705d54d SHA512 206bd08f0a5b7f7107e60c9e9c1a15fa7e74916bacb5399cccdd936b426768834ff24424ea77e8d1706afa98d88bb5a098b3b0203039024a3b5f5388c4a9735b |
| 23 |
DIST trilinos-12.14.1.tar.gz 129036436 BLAKE2B e7401df2ff8408a7af4a8e90d93b1929df65228c4f5cf3c754d20ebdfa8f3835800f540e87c1198e0baf2fefe0920618ae497f59373720754ab0c9dc1da93136 SHA512 dfff0e0582cb5ad12614dd53e9635572c8d1ee86d96f432f5a6e046af63edb13f6bfa3037204ab89fbb0d27e9be9bd9661d47efb41ab2a6e421bca5eba6b6a87 |
| 24 |
+DIST trilinos-12.18.1-patches-r0.tar.xz 6236 BLAKE2B fdcdedde68ef855aa98671223ad2c42467284ad7ca364e2b5ca715094a6efacc463f2d1812ee63ac980ca87dbe16bb2ac04835f52efa1df34651a608cb5407e9 SHA512 e6db2be4642b8f9797b0be6dd05641ae469dd5117b1b04da54ed955bd56473d6aaa69d59dfd7869db1e7059d2d9b2cb2d9269dd5ef863663eabb90c5c256b987 |
| 25 |
DIST trilinos-12.18.1.tar.gz 152007573 BLAKE2B 5dc2ee432d777712fb4ca1dc2d7ad68015f523fdbcbd4f55388a89d31c0946a1c5031b3e8f906952cf6b2f4f16928e6da5f17b1f6ee0f0e5669cfce5c8a09367 SHA512 e2a57df57e8e98ed97bbde9c1e768738f0eaccc32466aff6daa308573a860b3debee89bd570c113ca0f6a6458ff562aa6596ddf657236c368b7b2e26a4b4466b |
| 26 |
|
| 27 |
diff --git a/sci-libs/trilinos/trilinos-12.18.1.ebuild b/sci-libs/trilinos/trilinos-12.18.1.ebuild |
| 28 |
index 58c77990f12..40ce8083314 100644 |
| 29 |
--- a/sci-libs/trilinos/trilinos-12.18.1.ebuild |
| 30 |
+++ b/sci-libs/trilinos/trilinos-12.18.1.ebuild |
| 31 |
@@ -10,7 +10,8 @@ DESCRIPTION="Scientific library collection for large scale problems" |
| 32 |
HOMEPAGE="http://trilinos.sandia.gov/" |
| 33 |
MY_PV="${PV//\./-}" |
| 34 |
PATCHSET="r0" |
| 35 |
-SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz" |
| 36 |
+SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz |
| 37 |
+ https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz" |
| 38 |
|
| 39 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 40 |
|
| 41 |
@@ -65,6 +66,7 @@ DEPEND="${RDEPEND} |
| 42 |
S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}" |
| 43 |
|
| 44 |
PATCHES=( |
| 45 |
+ "${WORKDIR}"/patches |
| 46 |
) |
| 47 |
|
| 48 |
trilinos_conf() { |
| 49 |
@@ -192,10 +194,14 @@ src_install() { |
| 50 |
cmake-utils_src_install |
| 51 |
|
| 52 |
# Clean up the mess: |
| 53 |
+ rm "${ED}"/TrilinosRepoVersion.txt || die "rm failed" |
| 54 |
mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed" |
| 55 |
if [ -f "${ED}"/lib/exodus.py ]; then |
| 56 |
mv "${ED}"/lib/exodus.py "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed" |
| 57 |
fi |
| 58 |
+ if [[ $(get_libdir) != lib ]]; then |
| 59 |
+ mv "${ED}"/usr/lib/pkgconfig "${ED}/usr/$(get_libdir)" || die "mv failed" |
| 60 |
+ fi |
| 61 |
|
| 62 |
# |
| 63 |
# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker |
Archives