| 1 |
bicatali 08/09/25 09:54:22 |
| 2 |
|
| 3 |
Modified: numpy-1.1.1.ebuild ChangeLog |
| 4 |
Removed: numpy-1.1.0.ebuild |
| 5 |
Log: |
| 6 |
One more fix for removal automagic blas/lapack detection, see bug #237739 |
| 7 |
(Portage version: 2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-python/numpy/numpy-1.1.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/numpy-1.1.1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/numpy-1.1.1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/numpy-1.1.1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: numpy-1.1.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.1.1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- numpy-1.1.1.ebuild 21 Aug 2008 16:27:41 -0000 1.1 |
| 23 |
+++ numpy-1.1.1.ebuild 25 Sep 2008 09:54:21 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.1.1.ebuild,v 1.1 2008/08/21 16:27:41 bicatali Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.1.1.ebuild,v 1.2 2008/09/25 09:54:21 bicatali Exp $ |
| 29 |
|
| 30 |
NEED_PYTHON=2.4 |
| 31 |
|
| 32 |
@@ -64,20 +64,21 @@ |
| 33 |
|
| 34 |
# Fix some paths and docs in f2py |
| 35 |
epatch "${FILESDIR}"/${PN}-1.1.0-f2py.patch |
| 36 |
- |
| 37 |
if use lapack; then |
| 38 |
append-ldflags "$(pkg-config --libs-only-other cblas lapack)" |
| 39 |
- # cblas and lapack libraries under the name of atlas |
| 40 |
- # otherwise fast _dotblas is not built |
| 41 |
+ sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die |
| 42 |
cat >> site.cfg <<-EOF |
| 43 |
- [atlas] |
| 44 |
- include_dirs = $(pkg-config --cflags-only-I cblas lapack \ |
| 45 |
+ [blas_opt] |
| 46 |
+ include_dirs = $(pkg-config --cflags-only-I cblas \ |
| 47 |
| sed -e 's/^-I//' -e 's/ -I/:/g') |
| 48 |
- library_dirs = $(pkg-config --libs-only-L cblas lapack \ |
| 49 |
+ library_dirs = $(pkg-config --libs-only-L cblas \ |
| 50 |
| sed -e 's/^-L//' -e 's/ -L/:/g') |
| 51 |
- atlas_libs = $(pkg-config --libs-only-l cblas \ |
| 52 |
+ libraries = $(pkg-config --libs-only-l cblas \ |
| 53 |
| sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') |
| 54 |
- lapack_libs = $(pkg-config --libs-only-l lapack \ |
| 55 |
+ [lapack_opt] |
| 56 |
+ library_dirs = $(pkg-config --libs-only-L lapack \ |
| 57 |
+ | sed -e 's/^-L//' -e 's/ -L/:/g') |
| 58 |
+ libraries = $(pkg-config --libs-only-l lapack \ |
| 59 |
| sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') |
| 60 |
EOF |
| 61 |
else |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.63 dev-python/numpy/ChangeLog |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.63&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.63&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/ChangeLog?r1=1.62&r2=1.63 |
| 70 |
|
| 71 |
Index: ChangeLog |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v |
| 74 |
retrieving revision 1.62 |
| 75 |
retrieving revision 1.63 |
| 76 |
diff -u -r1.62 -r1.63 |
| 77 |
--- ChangeLog 21 Aug 2008 16:27:41 -0000 1.62 |
| 78 |
+++ ChangeLog 25 Sep 2008 09:54:21 -0000 1.63 |
| 79 |
@@ -1,6 +1,10 @@ |
| 80 |
# ChangeLog for dev-python/numpy |
| 81 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 82 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.62 2008/08/21 16:27:41 bicatali Exp $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.63 2008/09/25 09:54:21 bicatali Exp $ |
| 84 |
+ |
| 85 |
+ 25 Sep 2008; Sébastien Fabbro <bicatali@g.o> -numpy-1.1.0.ebuild, |
| 86 |
+ numpy-1.1.1.ebuild: |
| 87 |
+ One more fix for removal automagic blas/lapack detection, see bug #237739 |
| 88 |
|
| 89 |
*numpy-1.1.1 (21 Aug 2008) |
Archives