From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E0BFA138359 for ; Sun, 4 Oct 2020 22:55:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40436E08C3; Sun, 4 Oct 2020 22:55:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2AD8DE08C3 for ; Sun, 4 Oct 2020 22:55:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BED55335D2B for ; Sun, 4 Oct 2020 22:55:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E2E3343 for ; Sun, 4 Oct 2020 22:55:36 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1601852129.58f23b8c52b496150e70c679fdb314572cbb0a72.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpl/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/hpl/hpl-2.0-r3.ebuild sys-cluster/hpl/hpl-2.0-r4.ebuild X-VCS-Directories: sys-cluster/hpl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 58f23b8c52b496150e70c679fdb314572cbb0a72 X-VCS-Branch: master Date: Sun, 4 Oct 2020 22:55:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 03b8fafb-35ce-436b-a692-0b45b7452871 X-Archives-Hash: 927699f8df9ae70201d3f5cf04b82ace commit: 58f23b8c52b496150e70c679fdb314572cbb0a72 Author: Sam James gentoo org> AuthorDate: Sun Oct 4 22:33:30 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sun Oct 4 22:55:29 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58f23b8c sys-cluster/hpl: port to EAPI 7 Closes: https://bugs.gentoo.org/740930 Closes: https://bugs.gentoo.org/725808 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> .../hpl/{hpl-2.0-r3.ebuild => hpl-2.0-r4.ebuild} | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/sys-cluster/hpl/hpl-2.0-r3.ebuild b/sys-cluster/hpl/hpl-2.0-r4.ebuild similarity index 79% rename from sys-cluster/hpl/hpl-2.0-r3.ebuild rename to sys-cluster/hpl/hpl-2.0-r4.ebuild index d706f2b63d6..dab8670c739 100644 --- a/sys-cluster/hpl/hpl-2.0-r3.ebuild +++ b/sys-cluster/hpl/hpl-2.0-r4.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit eutils multilib toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Portable Implementation of the Linpack Benchmark for Distributed-Memory Clusters" HOMEPAGE="http://www.netlib.org/benchmark/hpl/" @@ -14,12 +14,12 @@ LICENSE="HPL" KEYWORDS="~amd64 ~x86" IUSE="doc" +BDEPEND="virtual/pkgconfig" RDEPEND=" virtual/blas virtual/lapack virtual/mpi" -DEPEND="${DEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" src_prepare() { local a="" @@ -38,28 +38,34 @@ src_prepare() { -e '/^CC\>/s,= .*,= mpicc,' \ -e '/^CCFLAGS\>/s|= .*|= $(HPL_DEFS) ${CFLAGS}|' \ -e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \ + -e "/^ARCHIVER\>/s|= .*|= $(tc-getAR)|" \ Make.gentoo_hpl_fblas_x86 || die + + default } src_compile() { # parallel make failure bug #321539 - HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86 + HOME="${WORKDIR}" emake -j1 arch=gentoo_hpl_fblas_x86 } src_install() { dobin bin/gentoo_hpl_fblas_x86/xhpl - dolib lib/gentoo_hpl_fblas_x86/libhpl.a + dolib.a lib/gentoo_hpl_fblas_x86/libhpl.a + dodoc INSTALL BUGS COPYRIGHT HISTORY README TUNING \ bin/gentoo_hpl_fblas_x86/HPL.dat doman man/man3/*.3 + if use doc; then - dohtml -r www/* + docinto html + dodoc -r www/* fi } pkg_postinst() { - einfo "Remember to copy /usr/share/hpl/HPL.dat to your working directory" + einfo "Remember to copy ${EROOT}/usr/share/hpl/HPL.dat to your working directory" einfo "before running xhpl. Typically one may run hpl by executing:" - einfo "\"mpiexec -np 4 /usr/bin/xhpl\"" + einfo "\"mpiexec -np 4 ${EROOT}/usr/bin/xhpl\"" einfo "where -np specifies the number of processes." }