| 1 |
bicatali 11/01/24 21:04:56 |
| 2 |
|
| 3 |
Modified: arpack-96-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Added missing lapack dependency, fixed some as-needed requirements for parpack in the patch, fixed a test. Also should fix bug #352602 and bug #345713 |
| 6 |
|
| 7 |
(Portage version: 2.1.9.34/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.21 sci-libs/arpack/arpack-96-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/arpack/arpack-96-r2.ebuild?rev=1.21&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/arpack/arpack-96-r2.ebuild?rev=1.21&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/arpack/arpack-96-r2.ebuild?r1=1.20&r2=1.21 |
| 15 |
|
| 16 |
Index: arpack-96-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-96-r2.ebuild,v |
| 19 |
retrieving revision 1.20 |
| 20 |
retrieving revision 1.21 |
| 21 |
diff -u -r1.20 -r1.21 |
| 22 |
--- arpack-96-r2.ebuild 1 Dec 2010 18:15:49 -0000 1.20 |
| 23 |
+++ arpack-96-r2.ebuild 24 Jan 2011 21:04:56 -0000 1.21 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2010 Gentoo Foundation |
| 26 |
+# Copyright 1999-2011 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-96-r2.ebuild,v 1.20 2010/12/01 18:15:49 bicatali Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/arpack-96-r2.ebuild,v 1.21 2011/01/24 21:04:56 bicatali Exp $ |
| 30 |
|
| 31 |
EAPI=2 |
| 32 |
inherit eutils autotools toolchain-funcs |
| 33 |
@@ -9,16 +9,17 @@ |
| 34 |
HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/" |
| 35 |
SRC_URI="http://www.caam.rice.edu/software/ARPACK/SRC/${PN}${PV}.tar.gz |
| 36 |
http://www.caam.rice.edu/software/ARPACK/SRC/p${PN}${PV}.tar.gz |
| 37 |
- mirror://gentoo/${P}-patches.tar.bz2 |
| 38 |
+ http://dev.gentoo.org/~bicatali/${P}-patches.tar.bz2 |
| 39 |
doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz |
| 40 |
http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )" |
| 41 |
|
| 42 |
LICENSE="BSD" |
| 43 |
SLOT="0" |
| 44 |
KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" |
| 45 |
-IUSE="mpi doc examples" |
| 46 |
+IUSE="doc examples mpi static-libs" |
| 47 |
|
| 48 |
RDEPEND="virtual/blas |
| 49 |
+ virtual/lapack |
| 50 |
mpi? ( virtual/mpi )" |
| 51 |
DEPEND="${RDEPEND} |
| 52 |
dev-util/pkgconfig" |
| 53 |
@@ -31,20 +32,20 @@ |
| 54 |
} |
| 55 |
|
| 56 |
src_prepare() { |
| 57 |
+ cd "${WORKDIR}" |
| 58 |
epatch "${WORKDIR}"/${PN}-arscnd.patch |
| 59 |
epatch "${WORKDIR}"/${PN}-autotools.patch |
| 60 |
- |
| 61 |
- BLAS_LIBS="$(pkg-config --libs blas)" |
| 62 |
+ cd "${S}" |
| 63 |
# fix examples library paths |
| 64 |
sed -i \ |
| 65 |
-e '/^include/d' \ |
| 66 |
- -e "s:\$(ALIBS):-larpack ${BLAS_LIBS}:g" \ |
| 67 |
+ -e "s:\$(ALIBS):-larpack $(pkg-config --libs blas lapack):g" \ |
| 68 |
-e 's:$(FFLAGS):$(FFLAGS) $(LDFLAGS):g' \ |
| 69 |
EXAMPLES/*/makefile || die "sed failed" |
| 70 |
|
| 71 |
sed -i \ |
| 72 |
-e '/^include/d' \ |
| 73 |
- -e "s:\$(PLIBS):-larpack -lparpack ${BLAS_LIBS}:g" \ |
| 74 |
+ -e "s:\$(PLIBS):-larpack -lparpack $(pkg-config --libs blas lapack):g" \ |
| 75 |
-e 's:_$(PLAT)::g' \ |
| 76 |
-e 's:$(PFC):mpif77:g' \ |
| 77 |
-e 's:$(PFFLAGS):$(FFLAGS) $(LDFLAGS) $(EXTOBJS):g' \ |
| 78 |
@@ -54,7 +55,9 @@ |
| 79 |
|
| 80 |
src_configure() { |
| 81 |
econf \ |
| 82 |
- --with-blas="${BLAS_LIBS}" \ |
| 83 |
+ --with-blas="$(pkg-config --libs blas)" \ |
| 84 |
+ --with-lapack="$(pkg-config --libs lapack)" \ |
| 85 |
+ $(use_enable static-libs static) \ |
| 86 |
$(use_enable mpi) |
| 87 |
} |
| 88 |
|
| 89 |
@@ -77,7 +80,7 @@ |
| 90 |
emake \ |
| 91 |
FC=mpif77 \ |
| 92 |
EXTOBJS="dpttr{f,s}.o" \ |
| 93 |
- LDFLAGS="-L${S}/.libs -L${S}/PARPACK/.libs" \ |
| 94 |
+ LDFLAGS="${LDFLAGS} -L${S}/.libs -L${S}/PARPACK/.libs" \ |
| 95 |
pdndrv || die "emake pdndrv failed" |
| 96 |
for p in 1 3; do |
| 97 |
prog=pdndrv${p} |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
1.24 sci-libs/arpack/ChangeLog |
| 102 |
|
| 103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/arpack/ChangeLog?rev=1.24&view=markup |
| 104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/arpack/ChangeLog?rev=1.24&content-type=text/plain |
| 105 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/arpack/ChangeLog?r1=1.23&r2=1.24 |
| 106 |
|
| 107 |
Index: ChangeLog |
| 108 |
=================================================================== |
| 109 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v |
| 110 |
retrieving revision 1.23 |
| 111 |
retrieving revision 1.24 |
| 112 |
diff -u -r1.23 -r1.24 |
| 113 |
--- ChangeLog 9 Jul 2010 10:01:07 -0000 1.23 |
| 114 |
+++ ChangeLog 24 Jan 2011 21:04:56 -0000 1.24 |
| 115 |
@@ -1,6 +1,11 @@ |
| 116 |
# ChangeLog for sci-libs/arpack |
| 117 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 118 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.23 2010/07/09 10:01:07 ssuominen Exp $ |
| 119 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 120 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arpack/ChangeLog,v 1.24 2011/01/24 21:04:56 bicatali Exp $ |
| 121 |
+ |
| 122 |
+ 24 Jan 2011; Sébastien Fabbro <bicatali@g.o> arpack-96-r2.ebuild: |
| 123 |
+ Added missing lapack dependency, fixed some as-needed requirements for |
| 124 |
+ parpack in the patch, fixed a test. Also should fix bug #352602 and bug |
| 125 |
+ #345713 |
| 126 |
|
| 127 |
09 Jul 2010; Samuli Suominen <ssuominen@g.o> arpack-96-r2.ebuild: |
| 128 |
ppc64 stable wrt #318649 |
Archives