| 1 |
bicatali 08/09/28 21:31:59 |
| 2 |
|
| 3 |
Modified: ChangeLog numpy-1.2.0.ebuild |
| 4 |
Log: |
| 5 |
Fixed again blas/lapack configuration to be compatible with the available gentoo implementations |
| 6 |
(Portage version: 2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.65 dev-python/numpy/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.65&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.65&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/ChangeLog?r1=1.64&r2=1.65 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v |
| 18 |
retrieving revision 1.64 |
| 19 |
retrieving revision 1.65 |
| 20 |
diff -u -r1.64 -r1.65 |
| 21 |
--- ChangeLog 26 Sep 2008 20:05:51 -0000 1.64 |
| 22 |
+++ ChangeLog 28 Sep 2008 21:31:59 -0000 1.65 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-python/numpy |
| 25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.64 2008/09/26 20:05:51 bicatali Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.65 2008/09/28 21:31:59 bicatali Exp $ |
| 28 |
+ |
| 29 |
+ 28 Sep 2008; Sébastien Fabbro <bicatali@g.o> numpy-1.2.0.ebuild: |
| 30 |
+ Fixed again blas/lapack configuration to be compatible with the available |
| 31 |
+ gentoo implementations |
| 32 |
|
| 33 |
*numpy-1.2.0 (26 Sep 2008) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 dev-python/numpy/numpy-1.2.0.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/numpy-1.2.0.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/numpy-1.2.0.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/numpy-1.2.0.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: numpy-1.2.0.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.2.0.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- numpy-1.2.0.ebuild 26 Sep 2008 20:05:51 -0000 1.1 |
| 51 |
+++ numpy-1.2.0.ebuild 28 Sep 2008 21:31:59 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2008 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.2.0.ebuild,v 1.1 2008/09/26 20:05:51 bicatali Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.2.0.ebuild,v 1.2 2008/09/28 21:31:59 bicatali Exp $ |
| 57 |
|
| 58 |
NEED_PYTHON=2.4 |
| 59 |
|
| 60 |
@@ -79,18 +79,30 @@ |
| 61 |
append-ldflags "$(pkg-config --libs-only-other cblas lapack)" |
| 62 |
sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die |
| 63 |
cat >> site.cfg <<-EOF |
| 64 |
+ [atlas] |
| 65 |
+ include_dirs = $(pkg-config --cflags-only-I \ |
| 66 |
+ cblas lapack | sed -e 's/^-I//' -e 's/ -I/:/g') |
| 67 |
+ library_dirs = $(pkg-config --libs-only-L \ |
| 68 |
+ cblas lapack | sed -e \ |
| 69 |
+ 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):/usr/$(get_libdir) |
| 70 |
+ atlas_libs = $(pkg-config --libs-only-l \ |
| 71 |
+ cblas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') |
| 72 |
+ lapack_libs = $(pkg-config --libs-only-l \ |
| 73 |
+ lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') |
| 74 |
[blas_opt] |
| 75 |
- include_dirs = $(pkg-config --cflags-only-I cblas \ |
| 76 |
- | sed -e 's/^-I//' -e 's/ -I/:/g') |
| 77 |
- library_dirs = $(pkg-config --libs-only-L cblas \ |
| 78 |
- | sed -e 's/^-L//' -e 's/ -L/:/g') |
| 79 |
- libraries = $(pkg-config --libs-only-l cblas \ |
| 80 |
- | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') |
| 81 |
+ include_dirs = $(pkg-config --cflags-only-I \ |
| 82 |
+ cblas | sed -e 's/^-I//' -e 's/ -I/:/g') |
| 83 |
+ library_dirs = $(pkg-config --libs-only-L \ |
| 84 |
+ cblas | sed -e 's/^-L//' -e 's/ -L/:/g' \ |
| 85 |
+ -e 's/ //g'):/usr/$(get_libdir) |
| 86 |
+ libraries = $(pkg-config --libs-only-l \ |
| 87 |
+ cblas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') |
| 88 |
[lapack_opt] |
| 89 |
- library_dirs = $(pkg-config --libs-only-L lapack \ |
| 90 |
- | sed -e 's/^-L//' -e 's/ -L/:/g') |
| 91 |
- libraries = $(pkg-config --libs-only-l lapack \ |
| 92 |
- | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') |
| 93 |
+ library_dirs = $(pkg-config --libs-only-L \ |
| 94 |
+ lapack | sed -e 's/^-L//' -e 's/ -L/:/g' \ |
| 95 |
+ -e 's/ //g'):/usr/$(get_libdir) |
| 96 |
+ libraries = $(pkg-config --libs-only-l \ |
| 97 |
+ lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') |
| 98 |
EOF |
| 99 |
else |
| 100 |
export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None |
Archives