commit: 8a0ba08cb29477f1544d5514541b2930d24aac74 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Sun Feb 14 16:52:37 2016 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sun Feb 14 16:52:37 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=8a0ba08c
sys-cluster/hpl: Chop DESCRIPTION to 80 chars * Bump EAPI to 6 Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> sys-cluster/hpl/hpl-2.0-r1.ebuild | 10 ++++++---- sys-cluster/hpl/hpl-2.1.ebuild | 10 ++++++---- sys-cluster/hpl/metadata.xml | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/sys-cluster/hpl/hpl-2.0-r1.ebuild b/sys-cluster/hpl/hpl-2.0-r1.ebuild index 06f6f4c..2b1eccd 100644 --- a/sys-cluster/hpl/hpl-2.0-r1.ebuild +++ b/sys-cluster/hpl/hpl-2.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils mpi toolchain-funcs @@ -10,8 +10,8 @@ DESCRIPTION="High-Performance Linpack Benchmark for Distributed-Memory Computers HOMEPAGE="http://www.netlib.org/benchmark/hpl/"; SRC_URI="http://www.netlib.org/benchmark/hpl/hpl-${PV}.tar.gz"; -LICENSE="HPL" SLOT="0" +LICENSE="HPL" KEYWORDS="~x86 ~amd64" IUSE="doc" @@ -25,7 +25,7 @@ DEPEND="${RDEPEND} src_prepare() { local mpicc_path="$(mpi_pkg_cc)" - cp setup/Make.Linux_PII_FBLAS Make.gentoo_hpl_fblas_x86 + cp setup/Make.Linux_PII_FBLAS Make.gentoo_hpl_fblas_x86 || die sed -i \ -e "/^TOPdir/s,= .*,= ${S}," \ -e '/^HPL_OPTS\>/s,=,= -DHPL_DETAILED_TIMING -DHPL_COPY_L,' \ @@ -37,11 +37,13 @@ src_prepare() { -e "/^CC\>/s,= .*,= ${mpicc_path}," \ -e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS} $($(tc-getPKG_CONFIG) --libs-only-L blas lapack)|" \ Make.gentoo_hpl_fblas_x86 || die + default } src_compile() { # do NOT use emake here mpi_pkg_set_env + # parallel make failure bug #321539 HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86 mpi_pkg_restore_env } diff --git a/sys-cluster/hpl/hpl-2.1.ebuild b/sys-cluster/hpl/hpl-2.1.ebuild index f2dcf8c..b4b3a8e 100644 --- a/sys-cluster/hpl/hpl-2.1.ebuild +++ b/sys-cluster/hpl/hpl-2.1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils mpi multilib -DESCRIPTION="A Portable Implementation of the High-Performance Linpack Benchmark for Distributed-Memory Computers" +DESCRIPTION="High-Performance Linpack Benchmark for Distributed-Memory Computers" HOMEPAGE="http://www.netlib.org/benchmark/hpl/"; SRC_URI="http://www.netlib.org/benchmark/hpl/hpl-${PV}.tar.gz"; @@ -19,7 +19,7 @@ RDEPEND=" $(mpi_pkg_deplist) virtual/blas virtual/lapack" -DEPEND="${DEPEND} +DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { @@ -40,9 +40,11 @@ src_prepare() { -e "/^CCFLAGS\>/s|= .*|= \$(HPL_DEFS) ${CFLAGS}|" \ -e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \ Make.gentoo_hpl_fblas_x86 || die + default } src_compile() { + # do NOT use emake here mpi_pkg_set_env # parallel make failure bug #321539 HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86 diff --git a/sys-cluster/hpl/metadata.xml b/sys-cluster/hpl/metadata.xml index 9b28d5e..6f14b2f 100644 --- a/sys-cluster/hpl/metadata.xml +++ b/sys-cluster/hpl/metadata.xml @@ -6,7 +6,7 @@ <name>Michael Imhof</name> <description>Release manager, patch manager</description> </maintainer> -<maintainer type="project"> + <maintainer type="project"> <email>[email protected]</email> <name>Gentoo Cluster Project</name> </maintainer>
