Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpl/
Date: Sun, 04 Oct 2020 22:55:39
Message-Id: 1601852129.58f23b8c52b496150e70c679fdb314572cbb0a72.sam@gentoo
1 commit: 58f23b8c52b496150e70c679fdb314572cbb0a72
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 4 22:33:30 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 4 22:55:29 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58f23b8c
7
8 sys-cluster/hpl: port to EAPI 7
9
10 Closes: https://bugs.gentoo.org/740930
11 Closes: https://bugs.gentoo.org/725808
12 Package-Manager: Portage-3.0.4, Repoman-3.0.1
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 .../hpl/{hpl-2.0-r3.ebuild => hpl-2.0-r4.ebuild} | 24 ++++++++++++++--------
16 1 file changed, 15 insertions(+), 9 deletions(-)
17
18 diff --git a/sys-cluster/hpl/hpl-2.0-r3.ebuild b/sys-cluster/hpl/hpl-2.0-r4.ebuild
19 similarity index 79%
20 rename from sys-cluster/hpl/hpl-2.0-r3.ebuild
21 rename to sys-cluster/hpl/hpl-2.0-r4.ebuild
22 index d706f2b63d6..dab8670c739 100644
23 --- a/sys-cluster/hpl/hpl-2.0-r3.ebuild
24 +++ b/sys-cluster/hpl/hpl-2.0-r4.ebuild
25 @@ -1,9 +1,9 @@
26 # Copyright 1999-2020 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 -EAPI=4
30 +EAPI=7
31
32 -inherit eutils multilib toolchain-funcs
33 +inherit toolchain-funcs
34
35 DESCRIPTION="Portable Implementation of the Linpack Benchmark for Distributed-Memory Clusters"
36 HOMEPAGE="http://www.netlib.org/benchmark/hpl/"
37 @@ -14,12 +14,12 @@ LICENSE="HPL"
38 KEYWORDS="~amd64 ~x86"
39 IUSE="doc"
40
41 +BDEPEND="virtual/pkgconfig"
42 RDEPEND="
43 virtual/blas
44 virtual/lapack
45 virtual/mpi"
46 -DEPEND="${DEPEND}
47 - virtual/pkgconfig"
48 +DEPEND="${RDEPEND}"
49
50 src_prepare() {
51 local a=""
52 @@ -38,28 +38,34 @@ src_prepare() {
53 -e '/^CC\>/s,= .*,= mpicc,' \
54 -e '/^CCFLAGS\>/s|= .*|= $(HPL_DEFS) ${CFLAGS}|' \
55 -e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \
56 + -e "/^ARCHIVER\>/s|= .*|= $(tc-getAR)|" \
57 Make.gentoo_hpl_fblas_x86 || die
58 +
59 + default
60 }
61
62 src_compile() {
63 # parallel make failure bug #321539
64 - HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86
65 + HOME="${WORKDIR}" emake -j1 arch=gentoo_hpl_fblas_x86
66 }
67
68 src_install() {
69 dobin bin/gentoo_hpl_fblas_x86/xhpl
70 - dolib lib/gentoo_hpl_fblas_x86/libhpl.a
71 + dolib.a lib/gentoo_hpl_fblas_x86/libhpl.a
72 +
73 dodoc INSTALL BUGS COPYRIGHT HISTORY README TUNING \
74 bin/gentoo_hpl_fblas_x86/HPL.dat
75 doman man/man3/*.3
76 +
77 if use doc; then
78 - dohtml -r www/*
79 + docinto html
80 + dodoc -r www/*
81 fi
82 }
83
84 pkg_postinst() {
85 - einfo "Remember to copy /usr/share/hpl/HPL.dat to your working directory"
86 + einfo "Remember to copy ${EROOT}/usr/share/hpl/HPL.dat to your working directory"
87 einfo "before running xhpl. Typically one may run hpl by executing:"
88 - einfo "\"mpiexec -np 4 /usr/bin/xhpl\""
89 + einfo "\"mpiexec -np 4 ${EROOT}/usr/bin/xhpl\""
90 einfo "where -np specifies the number of processes."
91 }