1 |
bicatali 12/06/28 21:30:27 |
2 |
|
3 |
Modified: scipy-0.10.1.ebuild ChangeLog |
4 |
Removed: scipy-0.9.0-r3.ebuild scipy-0.10.0.ebuild |
5 |
Log: |
6 |
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 |
7 |
|
8 |
(Portage version: 2.2.01.20430-prefix/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.3 sci-libs/scipy/scipy-0.10.1.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.10.1.ebuild?rev=1.3&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.10.1.ebuild?rev=1.3&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/scipy-0.10.1.ebuild?r1=1.2&r2=1.3 |
16 |
|
17 |
Index: scipy-0.10.1.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.10.1.ebuild,v |
20 |
retrieving revision 1.2 |
21 |
retrieving revision 1.3 |
22 |
diff -u -r1.2 -r1.3 |
23 |
--- scipy-0.10.1.ebuild 4 May 2012 08:22:49 -0000 1.2 |
24 |
+++ scipy-0.10.1.ebuild 28 Jun 2012 21:30:27 -0000 1.3 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2012 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.10.1.ebuild,v 1.2 2012/05/04 08:22:49 jdhore Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.10.1.ebuild,v 1.3 2012/06/28 21:30:27 bicatali Exp $ |
30 |
|
31 |
EAPI=4 |
32 |
|
33 |
@@ -66,21 +66,33 @@ |
34 |
fi |
35 |
} |
36 |
|
37 |
+ |
38 |
+pc_incdir() { |
39 |
+ pkg-config --cflags-only-I $@ | \ |
40 |
+ sed -e 's/^-I//' -e 's/[ ]*-I/:/g' |
41 |
+} |
42 |
+ |
43 |
+pc_libdir() { |
44 |
+ pkg-config --libs-only-L $@ | \ |
45 |
+ sed -e 's/^-L//' -e 's/[ ]*-L/:/g' |
46 |
+} |
47 |
+ |
48 |
+pc_libs() { |
49 |
+ pkg-config --libs-only-l $@ | \ |
50 |
+ sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \ |
51 |
+ -e 's/^-l//' -e 's/[ ]*-l/,/g' |
52 |
+} |
53 |
+ |
54 |
src_prepare() { |
55 |
local libdir="${EPREFIX}"/usr/$(get_libdir) |
56 |
cat >> site.cfg <<-EOF |
57 |
[blas] |
58 |
- include_dirs = $(pkg-config --cflags-only-I \ |
59 |
- cblas | sed -e 's/^-I//' -e 's/ -I/:/g') |
60 |
- library_dirs = $(pkg-config --libs-only-L \ |
61 |
- cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir} |
62 |
- blas_libs = $(pkg-config --libs-only-l \ |
63 |
- cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') |
64 |
+ include_dirs = $(pc_incdir cblas) |
65 |
+ library_dirs = $(pc_libdir cblas blas):${libdir} |
66 |
+ blas_libs = $(pc_libs cblas blas) |
67 |
[lapack] |
68 |
- library_dirs = $(pkg-config --libs-only-L \ |
69 |
- lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir} |
70 |
- lapack_libs = $(pkg-config --libs-only-l \ |
71 |
- lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g') |
72 |
+ library_dirs = $(pc_libdir lapack):${libdir} |
73 |
+ lapack_libs = $(pc_libs lapack) |
74 |
EOF |
75 |
} |
76 |
|
77 |
|
78 |
|
79 |
|
80 |
1.78 sci-libs/scipy/ChangeLog |
81 |
|
82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/ChangeLog?rev=1.78&view=markup |
83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/ChangeLog?rev=1.78&content-type=text/plain |
84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/scipy/ChangeLog?r1=1.77&r2=1.78 |
85 |
|
86 |
Index: ChangeLog |
87 |
=================================================================== |
88 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v |
89 |
retrieving revision 1.77 |
90 |
retrieving revision 1.78 |
91 |
diff -u -r1.77 -r1.78 |
92 |
--- ChangeLog 4 May 2012 08:22:49 -0000 1.77 |
93 |
+++ ChangeLog 28 Jun 2012 21:30:27 -0000 1.78 |
94 |
@@ -1,6 +1,11 @@ |
95 |
# ChangeLog for sci-libs/scipy |
96 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
97 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.77 2012/05/04 08:22:49 jdhore Exp $ |
98 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.78 2012/06/28 21:30:27 bicatali Exp $ |
99 |
+ |
100 |
+ 28 Jun 2012; Sebastien Fabbro <fabbros@g.o> -scipy-0.10.0.ebuild, |
101 |
+ -scipy-0.9.0-r3.ebuild, scipy-0.10.1.ebuild: |
102 |
+ Cleaned up a bit the pkg-config mangling for blas/lapack. Hack to strip -lm |
103 |
+ because it would not link with system blas/lapack on prefix |
104 |
|
105 |
04 May 2012; Jeff Horelick <jdhore@g.o> scipy-0.9.0-r1.ebuild, |
106 |
scipy-0.9.0-r3.ebuild, scipy-0.10.0.ebuild, scipy-0.10.1.ebuild: |