| 1 |
jlec 13/02/27 15:57:37 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog hpl-2.0-r1.ebuild |
| 4 |
Added: hpl-2.0-r2.ebuild |
| 5 |
Log: |
| 6 |
sys-cluster/hpl: Add missing dep on virtual/pkgconfig; use pc config to detect blas/lapack |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.6 sys-cluster/hpl/metadata.xml |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/hpl/metadata.xml?rev=1.6&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/hpl/metadata.xml?rev=1.6&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/hpl/metadata.xml?r1=1.5&r2=1.6 |
| 16 |
|
| 17 |
Index: metadata.xml |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/hpl/metadata.xml,v |
| 20 |
retrieving revision 1.5 |
| 21 |
retrieving revision 1.6 |
| 22 |
diff -u -r1.5 -r1.6 |
| 23 |
--- metadata.xml 10 Sep 2010 19:41:29 -0000 1.5 |
| 24 |
+++ metadata.xml 27 Feb 2013 15:57:37 -0000 1.6 |
| 25 |
@@ -1,5 +1,5 @@ |
| 26 |
<?xml version="1.0" encoding="UTF-8"?> |
| 27 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 28 |
<pkgmetadata> |
| 29 |
-<herd>cluster</herd> |
| 30 |
+ <herd>cluster</herd> |
| 31 |
</pkgmetadata> |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.19 sys-cluster/hpl/ChangeLog |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/hpl/ChangeLog?rev=1.19&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/hpl/ChangeLog?rev=1.19&content-type=text/plain |
| 39 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/hpl/ChangeLog?r1=1.18&r2=1.19 |
| 40 |
|
| 41 |
Index: ChangeLog |
| 42 |
=================================================================== |
| 43 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/hpl/ChangeLog,v |
| 44 |
retrieving revision 1.18 |
| 45 |
retrieving revision 1.19 |
| 46 |
diff -u -r1.18 -r1.19 |
| 47 |
--- ChangeLog 1 Feb 2011 21:44:39 -0000 1.18 |
| 48 |
+++ ChangeLog 27 Feb 2013 15:57:37 -0000 1.19 |
| 49 |
@@ -1,6 +1,12 @@ |
| 50 |
# ChangeLog for sys-cluster/hpl |
| 51 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 52 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/ChangeLog,v 1.18 2011/02/01 21:44:39 jsbronder Exp $ |
| 53 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/ChangeLog,v 1.19 2013/02/27 15:57:37 jlec Exp $ |
| 55 |
+ |
| 56 |
+*hpl-2.0-r2 (27 Feb 2013) |
| 57 |
+ |
| 58 |
+ 27 Feb 2013; Justin Lecher <jlec@g.o> hpl-2.0-r1.ebuild, |
| 59 |
+ +hpl-2.0-r2.ebuild, metadata.xml: |
| 60 |
+ Add missing dep on virtual/pkgconfig; use pc config to detect blas/lapack |
| 61 |
|
| 62 |
01 Feb 2011; Justin Bronder <jsbronder@g.o> hpl-2.0-r1.ebuild: |
| 63 |
Bump EAPI thanks to scarabeus. |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
1.3 sys-cluster/hpl/hpl-2.0-r1.ebuild |
| 68 |
|
| 69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/hpl/hpl-2.0-r1.ebuild?rev=1.3&view=markup |
| 70 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/hpl/hpl-2.0-r1.ebuild?rev=1.3&content-type=text/plain |
| 71 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/hpl/hpl-2.0-r1.ebuild?r1=1.2&r2=1.3 |
| 72 |
|
| 73 |
Index: hpl-2.0-r1.ebuild |
| 74 |
=================================================================== |
| 75 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/hpl/hpl-2.0-r1.ebuild,v |
| 76 |
retrieving revision 1.2 |
| 77 |
retrieving revision 1.3 |
| 78 |
diff -u -r1.2 -r1.3 |
| 79 |
--- hpl-2.0-r1.ebuild 1 Feb 2011 21:44:39 -0000 1.2 |
| 80 |
+++ hpl-2.0-r1.ebuild 27 Feb 2013 15:57:37 -0000 1.3 |
| 81 |
@@ -1,32 +1,40 @@ |
| 82 |
-# Copyright 1999-2011 Gentoo Foundation |
| 83 |
+# Copyright 1999-2013 Gentoo Foundation |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/hpl-2.0-r1.ebuild,v 1.2 2011/02/01 21:44:39 jsbronder Exp $ |
| 86 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/hpl-2.0-r1.ebuild,v 1.3 2013/02/27 15:57:37 jlec Exp $ |
| 87 |
|
| 88 |
EAPI=4 |
| 89 |
-inherit eutils |
| 90 |
+ |
| 91 |
+inherit eutils multilib |
| 92 |
|
| 93 |
DESCRIPTION="A Portable Implementation of the High-Performance Linpack Benchmark for Distributed-Memory Computers" |
| 94 |
HOMEPAGE="http://www.netlib.org/benchmark/hpl/" |
| 95 |
SRC_URI="http://www.netlib.org/benchmark/hpl/hpl-${PV}.tar.gz" |
| 96 |
-LICENSE="HPL" |
| 97 |
+ |
| 98 |
SLOT="0" |
| 99 |
+LICENSE="HPL" |
| 100 |
KEYWORDS="~x86 ~amd64" |
| 101 |
- |
| 102 |
IUSE="doc" |
| 103 |
-DEPEND="virtual/mpi |
| 104 |
+ |
| 105 |
+RDEPEND=" |
| 106 |
virtual/blas |
| 107 |
- virtual/lapack" |
| 108 |
-RDEPEND="${DEPEND}" |
| 109 |
+ virtual/lapack |
| 110 |
+ virtual/mpi" |
| 111 |
+DEPEND="${DEPEND} |
| 112 |
+ virtual/pkgconfig" |
| 113 |
|
| 114 |
src_prepare() { |
| 115 |
- cp setup/Make.Linux_PII_FBLAS Make.gentoo_hpl_fblas_x86 |
| 116 |
+ local a="" |
| 117 |
+ local locallib="${EPREFIX}/usr/$(get_libdir)/lib" |
| 118 |
+ local localblas="$(for i in $($(tc-getPKG_CONFIG) --libs-only-l blas lapack);do a="${a} ${i/-l/${locallib}}.so "; done; echo ${a})" |
| 119 |
+ |
| 120 |
+ cp setup/Make.Linux_PII_FBLAS Make.gentoo_hpl_fblas_x86 || die |
| 121 |
sed -i \ |
| 122 |
-e "/^TOPdir/s,= .*,= ${S}," \ |
| 123 |
-e '/^HPL_OPTS\>/s,=,= -DHPL_DETAILED_TIMING -DHPL_COPY_L,' \ |
| 124 |
-e '/^ARCH\>/s,= .*,= gentoo_hpl_fblas_x86,' \ |
| 125 |
-e '/^MPdir\>/s,= .*,=,' \ |
| 126 |
-e '/^MPlib\>/s,= .*,=,' \ |
| 127 |
- -e "/^LAlib\>/s,= .*,= /usr/$(get_libdir)/libblas.so /usr/$(get_libdir)/liblapack.so," \ |
| 128 |
+ -e "/^LAlib\>/s,= .*,= ${localblas}," \ |
| 129 |
-e '/^LINKER\>/s,= .*,= mpicc,' \ |
| 130 |
-e '/^CC\>/s,= .*,= mpicc,' \ |
| 131 |
-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \ |
| 132 |
@@ -34,7 +42,7 @@ |
| 133 |
} |
| 134 |
|
| 135 |
src_compile() { |
| 136 |
- # parallel make failure â bug #321539 |
| 137 |
+ # parallel make failure bug #321539 |
| 138 |
HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86 |
| 139 |
} |
| 140 |
|
| 141 |
|
| 142 |
|
| 143 |
|
| 144 |
1.1 sys-cluster/hpl/hpl-2.0-r2.ebuild |
| 145 |
|
| 146 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/hpl/hpl-2.0-r2.ebuild?rev=1.1&view=markup |
| 147 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/hpl/hpl-2.0-r2.ebuild?rev=1.1&content-type=text/plain |
| 148 |
|
| 149 |
Index: hpl-2.0-r2.ebuild |
| 150 |
=================================================================== |
| 151 |
# Copyright 1999-2013 Gentoo Foundation |
| 152 |
# Distributed under the terms of the GNU General Public License v2 |
| 153 |
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/hpl/hpl-2.0-r2.ebuild,v 1.1 2013/02/27 15:57:37 jlec Exp $ |
| 154 |
|
| 155 |
EAPI=4 |
| 156 |
|
| 157 |
inherit eutils multilib |
| 158 |
|
| 159 |
DESCRIPTION="A Portable Implementation of the High-Performance Linpack Benchmark for Distributed-Memory Computers" |
| 160 |
HOMEPAGE="http://www.netlib.org/benchmark/hpl/" |
| 161 |
SRC_URI="http://www.netlib.org/benchmark/hpl/hpl-${PV}.tar.gz" |
| 162 |
|
| 163 |
SLOT="0" |
| 164 |
LICENSE="HPL" |
| 165 |
KEYWORDS="~x86 ~amd64" |
| 166 |
IUSE="doc" |
| 167 |
|
| 168 |
RDEPEND=" |
| 169 |
virtual/blas |
| 170 |
virtual/lapack |
| 171 |
virtual/mpi" |
| 172 |
DEPEND="${DEPEND} |
| 173 |
virtual/pkgconfig" |
| 174 |
|
| 175 |
src_prepare() { |
| 176 |
local a="" |
| 177 |
local locallib="${EPREFIX}/usr/$(get_libdir)/lib" |
| 178 |
local localblas="$(for i in $($(tc-getPKG_CONFIG) --libs-only-l blas lapack);do a="${a} ${i/-l/${locallib}}.so "; done; echo ${a})" |
| 179 |
|
| 180 |
cp setup/Make.Linux_PII_FBLAS Make.gentoo_hpl_fblas_x86 || die |
| 181 |
sed -i \ |
| 182 |
-e "/^TOPdir/s,= .*,= ${S}," \ |
| 183 |
-e '/^HPL_OPTS\>/s,=,= -DHPL_DETAILED_TIMING -DHPL_COPY_L,' \ |
| 184 |
-e '/^ARCH\>/s,= .*,= gentoo_hpl_fblas_x86,' \ |
| 185 |
-e '/^MPdir\>/s,= .*,=,' \ |
| 186 |
-e '/^MPlib\>/s,= .*,=,' \ |
| 187 |
-e "/^LAlib\>/s,= .*,= ${localblas}," \ |
| 188 |
-e '/^LINKER\>/s,= .*,= mpicc,' \ |
| 189 |
-e '/^CC\>/s,= .*,= mpicc,' \ |
| 190 |
-e "/^LINKFLAGS\>/s|= .*|= ${LDFLAGS}|" \ |
| 191 |
Make.gentoo_hpl_fblas_x86 || die |
| 192 |
} |
| 193 |
|
| 194 |
src_compile() { |
| 195 |
# parallel make failure bug #321539 |
| 196 |
HOME=${WORKDIR} emake -j1 arch=gentoo_hpl_fblas_x86 |
| 197 |
} |
| 198 |
|
| 199 |
src_install() { |
| 200 |
dobin bin/gentoo_hpl_fblas_x86/xhpl |
| 201 |
dolib lib/gentoo_hpl_fblas_x86/libhpl.a |
| 202 |
dodoc INSTALL BUGS COPYRIGHT HISTORY README TUNING \ |
| 203 |
bin/gentoo_hpl_fblas_x86/HPL.dat |
| 204 |
doman man/man3/*.3 |
| 205 |
if use doc; then |
| 206 |
dohtml -r www/* |
| 207 |
fi |
| 208 |
} |
| 209 |
|
| 210 |
pkg_postinst() { |
| 211 |
einfo "Remember to copy /usr/share/hpl/HPL.dat to your working directory" |
| 212 |
einfo "before running xhpl. Typically one may run hpl by executing:" |
| 213 |
einfo "\"mpiexec -np 4 /usr/bin/xhpl\"" |
| 214 |
einfo "where -np specifies the number of processes." |
| 215 |
} |
Archives