From 777dd919f28d3bed6cbe42a9d14408acad562727 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Thu, 25 Sep 2008 09:54:21 +0000 Subject: One more fix for removal automagic blas/lapack detection, see bug #237739 (Portage version: 2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64) --- dev-python/numpy/ChangeLog | 6 +- dev-python/numpy/numpy-1.1.0.ebuild | 127 ------------------------------------ dev-python/numpy/numpy-1.1.1.ebuild | 19 +++--- 3 files changed, 15 insertions(+), 137 deletions(-) delete mode 100644 dev-python/numpy/numpy-1.1.0.ebuild (limited to 'dev-python/numpy') diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog index 1e6e1f2cd78d..b74d9f32ddb5 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.62 2008/08/21 16:27:41 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.63 2008/09/25 09:54:21 bicatali Exp $ + + 25 Sep 2008; Sébastien Fabbro -numpy-1.1.0.ebuild, + numpy-1.1.1.ebuild: + One more fix for removal automagic blas/lapack detection, see bug #237739 *numpy-1.1.1 (21 Aug 2008) diff --git a/dev-python/numpy/numpy-1.1.0.ebuild b/dev-python/numpy/numpy-1.1.0.ebuild deleted file mode 100644 index 5b5d852e4cbb..000000000000 --- a/dev-python/numpy/numpy-1.1.0.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# 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.1.0.ebuild,v 1.1 2008/06/22 11:13:01 bicatali Exp $ - -NEED_PYTHON=2.4 - -inherit distutils eutils flag-o-matic fortran - -DESCRIPTION="Fast array and numerical python library" -SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz" -HOMEPAGE="http://numeric.scipy.org/" - -RDEPEND="!dev-python/f2py - lapack? ( virtual/cblas virtual/lapack )" - -DEPEND="${RDEPEND} - lapack? ( dev-util/pkgconfig )" - -IUSE="lapack" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -LICENSE="BSD" - -# whatever LDFLAGS set will break linking -# see progress in http://projects.scipy.org/scipy/numpy/ticket/573 -if [ -n "${LDFLAGS}" ]; then - append-ldflags -shared -else - LDFLAGS="-shared" -fi - -pkg_setup() { - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - use lapack || return - FORTRAN="gfortran g77 ifc" - fortran_pkg_setup - local fc= - case ${FORTRANC} in - gfortran) fc=gnu95 ;; - g77) fc=gnu ;; - ifc|ifort) - if use ia64; then - fc=intele - elif use amd64; then - fc=intelem - else - fc=intel - fi - ;; - *) eerror "Unknown fortran compiler: ${FORTRANC}" - die "numpy_fortran_setup failed" ;; - esac - - # when fortran flags are set, pic is removed. - use amd64 && FFLAGS="${FFLAGS} -fPIC" - export NUMPY_FCONFIG="config_fc --fcompiler=${fc}" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Fix some paths and docs in f2py - epatch "${FILESDIR}"/${P}-f2py.patch - - if use lapack; then - append-ldflags "$(pkg-config --libs-only-other cblas lapack)" - # cblas and lapack libraries under the name of atlas - # otherwise fast _dotblas is not built - 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') - 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') - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi -} - -src_compile() { - # when fortran flags are set, pic is removed but unfortunately needed - distutils_src_compile ${NUMPY_FCONFIG} -} - -src_test() { - "${python}" setup.py ${NUMPY_FCONFIG} install \ - --home="${S}"/test \ - --no-compile \ - || die "install test failed" - - pushd "${S}"/test/lib*/python - PYTHONPATH=. "${python}" -c "import numpy; numpy.test(10,3)" 2>&1 \ - | tee test.log - grep -q '^OK$' test.log || die "test failed" - popd - - rm -rf test -} - -src_install() { - distutils_src_install ${NUMPY_FCONFIG} - - docinto numpy - dodoc numpy/doc/*txt || die "dodoc failed" - - docinto f2py - dodoc numpy/f2py/docs/*txt || die "dodoc f2py failed" - doman numpy/f2py/f2py.1 || die "doman failed" -} - -pkg_postinst() { - if ! built_with_use sys-devel/gcc fortran && - ! has_version dev-lang/ifc - then - ewarn "To use numpy's f2py you need a fortran compiler." - ewarn "You can either set USE=fortran flag and re-install gcc," - ewarn "or install dev-lang/ifc" - fi -} diff --git a/dev-python/numpy/numpy-1.1.1.ebuild b/dev-python/numpy/numpy-1.1.1.ebuild index 20101bad4547..bc279273441e 100644 --- a/dev-python/numpy/numpy-1.1.1.ebuild +++ b/dev-python/numpy/numpy-1.1.1.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.1.1.ebuild,v 1.1 2008/08/21 16:27:41 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.1.1.ebuild,v 1.2 2008/09/25 09:54:21 bicatali Exp $ NEED_PYTHON=2.4 @@ -64,20 +64,21 @@ src_unpack() { # Fix some paths and docs in f2py epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch - if use lapack; then append-ldflags "$(pkg-config --libs-only-other cblas lapack)" - # cblas and lapack libraries under the name of atlas - # otherwise fast _dotblas is not built + 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 \ + [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 lapack \ + library_dirs = $(pkg-config --libs-only-L cblas \ | sed -e 's/^-L//' -e 's/ -L/:/g') - atlas_libs = $(pkg-config --libs-only-l cblas \ + libraries = $(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 \ + [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') EOF else -- cgit v1.2.3-65-gdbad