diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2008-09-28 21:31:59 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2008-09-28 21:31:59 +0000 |
| commit | 4bc9652bf5cfdc0646c218ec02e04f75a1885ef0 (patch) | |
| tree | 18da494d3c6fb0fe908df9d64585b3c303651b98 /dev-python | |
| parent | Add ~arm wrt #225275 (diff) | |
| download | gentoo-2-4bc9652bf5cfdc0646c218ec02e04f75a1885ef0.tar.gz gentoo-2-4bc9652bf5cfdc0646c218ec02e04f75a1885ef0.tar.bz2 gentoo-2-4bc9652bf5cfdc0646c218ec02e04f75a1885ef0.zip | |
Fixed again blas/lapack configuration to be compatible with the available gentoo implementations
(Portage version: 2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/numpy/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/numpy/numpy-1.2.0.ebuild | 34 |
2 files changed, 28 insertions, 12 deletions
diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog index fb4cf5faaea0..c4a017c54646 100644 --- a/dev-python/numpy/ChangeLog +++ b/dev-python/numpy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/numpy # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.64 2008/09/26 20:05:51 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.65 2008/09/28 21:31:59 bicatali Exp $ + + 28 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> numpy-1.2.0.ebuild: + Fixed again blas/lapack configuration to be compatible with the available + gentoo implementations *numpy-1.2.0 (26 Sep 2008) diff --git a/dev-python/numpy/numpy-1.2.0.ebuild b/dev-python/numpy/numpy-1.2.0.ebuild index 782688d9136e..56959b148add 100644 --- a/dev-python/numpy/numpy-1.2.0.ebuild +++ b/dev-python/numpy/numpy-1.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.2.0.ebuild,v 1.1 2008/09/26 20:05:51 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.2.0.ebuild,v 1.2 2008/09/28 21:31:59 bicatali Exp $ NEED_PYTHON=2.4 @@ -79,18 +79,30 @@ src_unpack() { append-ldflags "$(pkg-config --libs-only-other cblas lapack)" sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die cat >> site.cfg <<-EOF + [atlas] + include_dirs = $(pkg-config --cflags-only-I \ + cblas lapack | sed -e 's/^-I//' -e 's/ -I/:/g') + library_dirs = $(pkg-config --libs-only-L \ + cblas lapack | sed -e \ + 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):/usr/$(get_libdir) + atlas_libs = $(pkg-config --libs-only-l \ + cblas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') + lapack_libs = $(pkg-config --libs-only-l \ + lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') [blas_opt] - include_dirs = $(pkg-config --cflags-only-I cblas \ - | sed -e 's/^-I//' -e 's/ -I/:/g') - library_dirs = $(pkg-config --libs-only-L cblas \ - | sed -e 's/^-L//' -e 's/ -L/:/g') - libraries = $(pkg-config --libs-only-l cblas \ - | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') + include_dirs = $(pkg-config --cflags-only-I \ + cblas | sed -e 's/^-I//' -e 's/ -I/:/g') + library_dirs = $(pkg-config --libs-only-L \ + cblas | sed -e 's/^-L//' -e 's/ -L/:/g' \ + -e 's/ //g'):/usr/$(get_libdir) + libraries = $(pkg-config --libs-only-l \ + cblas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') [lapack_opt] - library_dirs = $(pkg-config --libs-only-L lapack \ - | sed -e 's/^-L//' -e 's/ -L/:/g') - libraries = $(pkg-config --libs-only-l lapack \ - | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') + library_dirs = $(pkg-config --libs-only-L \ + lapack | sed -e 's/^-L//' -e 's/ -L/:/g' \ + -e 's/ //g'):/usr/$(get_libdir) + libraries = $(pkg-config --libs-only-l \ + lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') EOF else export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None |