diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2007-09-03 15:09:31 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2007-09-03 15:09:31 +0000 |
| commit | 880c1efd1a4fba0723036f468fca068bb9459929 (patch) | |
| tree | 30143bd6777ff171409f44851ade3428bd8a4408 | |
| parent | Version bumped. (diff) | |
| download | historical-880c1efd1a4fba0723036f468fca068bb9459929.tar.gz historical-880c1efd1a4fba0723036f468fca068bb9459929.tar.bz2 historical-880c1efd1a4fba0723036f468fca068bb9459929.zip | |
fixed lapack libs when threaded, cleaned-up lapack/fortran stuff
Package-Manager: portage-2.1.2.12
| -rw-r--r-- | dev-python/numeric/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/numeric/files/numeric-24.2-lapack.patch | 12 | ||||
| -rw-r--r-- | dev-python/numeric/numeric-24.2-r6.ebuild | 29 |
3 files changed, 29 insertions, 18 deletions
diff --git a/dev-python/numeric/ChangeLog b/dev-python/numeric/ChangeLog index 7f200b5e4919..d2637187aa09 100644 --- a/dev-python/numeric/ChangeLog +++ b/dev-python/numeric/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/numeric # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.34 2007/09/02 13:41:16 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.35 2007/09/03 15:09:31 bicatali Exp $ + + 03 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org> + files/numeric-24.2-lapack.patch, numeric-24.2-r6.ebuild: + fixed lapack libs when threaded, cleaned-up lapack/fortran stuff 02 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org> files/numeric-24.2-python25.patch: diff --git a/dev-python/numeric/files/numeric-24.2-lapack.patch b/dev-python/numeric/files/numeric-24.2-lapack.patch index 2ad651fa6104..7d1927601456 100644 --- a/dev-python/numeric/files/numeric-24.2-lapack.patch +++ b/dev-python/numeric/files/numeric-24.2-lapack.patch @@ -1,6 +1,5 @@ -diff -Nur Numeric-24.2.orig/customize.py Numeric-24.2/customize.py --- Numeric-24.2.orig/customize.py 2005-11-13 02:40:14.000000000 +0000 -+++ Numeric-24.2/customize.py 2007-09-01 22:11:50.123312885 +0100 ++++ Numeric-24.2/customize.py 2007-09-03 15:18:16.393643787 +0100 @@ -13,9 +13,9 @@ # will be used, except on Mac OS X, where the vecLib framework will be used # if found. @@ -9,7 +8,7 @@ diff -Nur Numeric-24.2.orig/customize.py Numeric-24.2/customize.py +use_system_lapack = 1 lapack_library_dirs = [] -lapack_libraries = [] -+lapack_libraries = ['lapack'] ++lapack_libraries = [@LAPACKLIB@] lapack_extra_link_args = [] # Example: using ATLAS @@ -20,11 +19,12 @@ diff -Nur Numeric-24.2.orig/customize.py Numeric-24.2/customize.py -use_dotblas = 0 -dotblas_include_dirs = [] +use_dotblas = 1 -+dotblas_include_dirs = ['/usr/include/atlas'] ++dotblas_include_dirs = [@CBLASINC@] dotblas_cblas_header = '<cblas.h>' - dotblas_library_dirs = lapack_library_dirs +-dotblas_library_dirs = lapack_library_dirs -dotblas_libraries = lapack_libraries -+dotblas_libraries = ['cblas', 'blas', 'atlas', 'g2c'] ++dotblas_library_dirs = [] ++dotblas_libraries = [@CBLASLIB@] dotblas_extra_link_args = [] # Example: using ATLAS diff --git a/dev-python/numeric/numeric-24.2-r6.ebuild b/dev-python/numeric/numeric-24.2-r6.ebuild index 215d4b2057ff..18fea31d7c74 100644 --- a/dev-python/numeric/numeric-24.2-r6.ebuild +++ b/dev-python/numeric/numeric-24.2-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r6.ebuild,v 1.2 2007/09/02 03:20:38 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-24.2-r6.ebuild,v 1.3 2007/09/03 15:09:31 bicatali Exp $ NEED_PYTHON=2.3 @@ -67,20 +67,27 @@ src_unpack() { flib=gfortran elif [[ "${FORTRANC}" == if* ]]; then flib=imf + elif [[ "${FORTRANC}" == g77 ]]; then + flib=g2c fi + local cblaslib= cblasinc= if [[ "${mycblas}" == reference ]]; then - sed -i \ - -e "s:g2c:${flib}:g" \ - -e "s:'atlas',::g" \ - -e "s:include/atlas:include/cblas:g" \ - "${S}"/customize.py \ - || die "sed for lapack failed" + cblaslib="'blas','cblas'" + cblasinc="'/usr/include/cblas'" elif [[ "${mycblas}" == atlas ]]; then - sed -i \ - -e "s:g2c:${flib}:g" \ - "${S}"/customize.py \ - || die "sed for lapack failed" + cblaslib="'blas','cblas','atlas'" + cblasinc="'/usr/include/atlas'" + elif [[ "${mycblas}" == threaded-atlas ]]; then + cblaslib="'blas','cblas','atlas','pthread'" + cblasinc="'/usr/include/atlas'" fi + sed -i \ + -e "s:@FLIB@:${flib}:g" \ + -e "s:@LAPACKLIB@:'lapack':g" \ + -e "s:@CBLASLIB@:${cblaslib}:g" \ + -e "s:@CBLASINC@:${cblasinc}:g" \ + "${S}"/customize.py \ + || die "sed for lapack support failed" fi } |