| 1 |
bicatali 12/06/28 21:16:40 |
| 2 |
|
| 3 |
Modified: numpy-1.6.2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Cleaned up a bit the pkg-config mangling for blas/lapack. Hack to strip -lm because it would not link with system blas/lapack on prefix |
| 6 |
|
| 7 |
(Portage version: 2.2.01.20430-prefix/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-python/numpy/numpy-1.6.2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: numpy-1.6.2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- numpy-1.6.2.ebuild 22 May 2012 16:34:49 -0000 1.1 |
| 23 |
+++ numpy-1.6.2.ebuild 28 Jun 2012 21:16:40 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 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.6.2.ebuild,v 1.1 2012/05/22 16:34:49 bicatali Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.2 2012/06/28 21:16:40 bicatali Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
@@ -59,7 +59,7 @@ |
| 33 |
append-fflags -fPIC |
| 34 |
NUMPY_FCONFIG="config_fc --noopt --noarch" |
| 35 |
# workaround bug 335908 |
| 36 |
- [[ ${FC} == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" |
| 37 |
+ [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" |
| 38 |
fi |
| 39 |
} |
| 40 |
|
| 41 |
@@ -70,26 +70,38 @@ |
| 42 |
fi |
| 43 |
} |
| 44 |
|
| 45 |
+pc_incdir() { |
| 46 |
+ pkg-config --cflags-only-I $@ | \ |
| 47 |
+ sed -e 's/^-I//' -e 's/[ ]*-I/:/g' |
| 48 |
+} |
| 49 |
+ |
| 50 |
+pc_libdir() { |
| 51 |
+ pkg-config --libs-only-L $@ | \ |
| 52 |
+ sed -e 's/^-L//' -e 's/[ ]*-L/:/g' |
| 53 |
+} |
| 54 |
+ |
| 55 |
+pc_libs() { |
| 56 |
+ pkg-config --libs-only-l $@ | \ |
| 57 |
+ sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \ |
| 58 |
+ -e 's/^-l//' -e 's/[ ]*-l/,/g' |
| 59 |
+} |
| 60 |
+ |
| 61 |
src_prepare() { |
| 62 |
epatch "${FILESDIR}"/${PN}-1.6.1-atlas.patch |
| 63 |
|
| 64 |
if use lapack; then |
| 65 |
append-ldflags "$(pkg-config --libs-only-other cblas lapack)" |
| 66 |
- sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die |
| 67 |
local libdir="${EPREFIX}"/usr/$(get_libdir) |
| 68 |
+ # make sure _dotblas.so gets built |
| 69 |
+ sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die |
| 70 |
cat >> site.cfg <<-EOF |
| 71 |
[blas] |
| 72 |
- include_dirs = $(pkg-config --cflags-only-I \ |
| 73 |
- cblas | sed -e 's/^-I//' -e 's/ -I/:/g') |
| 74 |
- library_dirs = $(pkg-config --libs-only-L \ |
| 75 |
- cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir} |
| 76 |
- blas_libs = $(pkg-config --libs-only-l \ |
| 77 |
- cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') |
| 78 |
+ include_dirs = $(pc_incdir cblas) |
| 79 |
+ library_dirs = $(pc_libdir cblas blas):${libdir} |
| 80 |
+ blas_libs = $(pc_libs cblas blas) |
| 81 |
[lapack] |
| 82 |
- library_dirs = $(pkg-config --libs-only-L \ |
| 83 |
- lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir} |
| 84 |
- lapack_libs = $(pkg-config --libs-only-l \ |
| 85 |
- lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') |
| 86 |
+ library_dirs = $(pc_libdir lapack):${libdir} |
| 87 |
+ lapack_libs = $(pc_libs lapack) |
| 88 |
EOF |
| 89 |
else |
| 90 |
export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None |
| 91 |
|
| 92 |
|
| 93 |
|
| 94 |
1.166 dev-python/numpy/ChangeLog |
| 95 |
|
| 96 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.166&view=markup |
| 97 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.166&content-type=text/plain |
| 98 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?r1=1.165&r2=1.166 |
| 99 |
|
| 100 |
Index: ChangeLog |
| 101 |
=================================================================== |
| 102 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v |
| 103 |
retrieving revision 1.165 |
| 104 |
retrieving revision 1.166 |
| 105 |
diff -u -r1.165 -r1.166 |
| 106 |
--- ChangeLog 28 Jun 2012 15:48:33 -0000 1.165 |
| 107 |
+++ ChangeLog 28 Jun 2012 21:16:40 -0000 1.166 |
| 108 |
@@ -1,6 +1,10 @@ |
| 109 |
# ChangeLog for dev-python/numpy |
| 110 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 111 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.165 2012/06/28 15:48:33 jer Exp $ |
| 112 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.166 2012/06/28 21:16:40 bicatali Exp $ |
| 113 |
+ |
| 114 |
+ 28 Jun 2012; Sebastien Fabbro <fabbros@g.o> numpy-1.6.2.ebuild: |
| 115 |
+ Cleaned up a bit the pkg-config mangling for blas/lapack. Hack to strip -lm |
| 116 |
+ because it would not link with system blas/lapack on prefix |
| 117 |
|
| 118 |
28 Jun 2012; Jeroen Roovers <jer@g.o> numpy-1.6.1-r1.ebuild: |
| 119 |
Stable for HPPA (bug #418419). |
Archives