* [gentoo-commits] gentoo-x86 commit in dev-python/numpy: numpy-1.6.2.ebuild ChangeLog
@ 2012-06-28 21:16 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 4+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2012-06-28 21:16 UTC (permalink / raw
To: gentoo-commits
bicatali 12/06/28 21:16:40
Modified: numpy-1.6.2.ebuild ChangeLog
Log:
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
(Portage version: 2.2.01.20430-prefix/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-python/numpy/numpy-1.6.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?r1=1.1&r2=1.2
Index: numpy-1.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- numpy-1.6.2.ebuild 22 May 2012 16:34:49 -0000 1.1
+++ numpy-1.6.2.ebuild 28 Jun 2012 21:16:40 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.1 2012/05/22 16:34:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.2 2012/06/28 21:16:40 bicatali Exp $
EAPI=4
@@ -59,7 +59,7 @@
append-fflags -fPIC
NUMPY_FCONFIG="config_fc --noopt --noarch"
# workaround bug 335908
- [[ ${FC} == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+ [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
fi
}
@@ -70,26 +70,38 @@
fi
}
+pc_incdir() {
+ pkg-config --cflags-only-I $@ | \
+ sed -e 's/^-I//' -e 's/[ ]*-I/:/g'
+}
+
+pc_libdir() {
+ pkg-config --libs-only-L $@ | \
+ sed -e 's/^-L//' -e 's/[ ]*-L/:/g'
+}
+
+pc_libs() {
+ pkg-config --libs-only-l $@ | \
+ sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
+ -e 's/^-l//' -e 's/[ ]*-l/,/g'
+}
+
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.6.1-atlas.patch
if use lapack; then
append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
- sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
local libdir="${EPREFIX}"/usr/$(get_libdir)
+ # make sure _dotblas.so gets built
+ sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
cat >> site.cfg <<-EOF
[blas]
- include_dirs = $(pkg-config --cflags-only-I \
- cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
- library_dirs = $(pkg-config --libs-only-L \
- cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
- blas_libs = $(pkg-config --libs-only-l \
- cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+ include_dirs = $(pc_incdir cblas)
+ library_dirs = $(pc_libdir cblas blas):${libdir}
+ blas_libs = $(pc_libs cblas blas)
[lapack]
- library_dirs = $(pkg-config --libs-only-L \
- lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
- lapack_libs = $(pkg-config --libs-only-l \
- lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+ library_dirs = $(pc_libdir lapack):${libdir}
+ lapack_libs = $(pc_libs lapack)
EOF
else
export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
1.166 dev-python/numpy/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.166&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.166&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?r1=1.165&r2=1.166
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- ChangeLog 28 Jun 2012 15:48:33 -0000 1.165
+++ ChangeLog 28 Jun 2012 21:16:40 -0000 1.166
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/numpy
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.165 2012/06/28 15:48:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.166 2012/06/28 21:16:40 bicatali Exp $
+
+ 28 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org> numpy-1.6.2.ebuild:
+ 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
28 Jun 2012; Jeroen Roovers <jer@gentoo.org> numpy-1.6.1-r1.ebuild:
Stable for HPPA (bug #418419).
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/numpy: numpy-1.6.2.ebuild ChangeLog
@ 2012-06-28 21:59 Mike Gilbert (floppym)
0 siblings, 0 replies; 4+ messages in thread
From: Mike Gilbert (floppym) @ 2012-06-28 21:59 UTC (permalink / raw
To: gentoo-commits
floppym 12/06/28 21:59:22
Modified: numpy-1.6.2.ebuild ChangeLog
Log:
Cleanup die usage for EAPI 4.
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
Revision Changes Path
1.3 dev-python/numpy/numpy-1.6.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?r1=1.2&r2=1.3
Index: numpy-1.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- numpy-1.6.2.ebuild 28 Jun 2012 21:16:40 -0000 1.2
+++ numpy-1.6.2.ebuild 28 Jun 2012 21:59:22 -0000 1.3
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.2 2012/06/28 21:16:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.3 2012/06/28 21:59:22 floppym Exp $
EAPI=4
PYTHON_DEPEND="*"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
inherit distutils eutils flag-o-matic fortran-2 toolchain-funcs versionator
@@ -136,12 +136,12 @@
python_execute_function -q delete_txt
docinto f2py
- dodoc numpy/f2py/docs/*.txt || die "dodoc f2py failed"
- doman numpy/f2py/f2py.1 || die "doman failed"
+ dodoc numpy/f2py/docs/*.txt
+ doman numpy/f2py/f2py.1
if use doc; then
insinto /usr/share/doc/${PF}
- doins -r "${WORKDIR}"/html || die
- doins "${DISTDIR}"/${DOC_P}*pdf || die
+ doins -r "${WORKDIR}"/html
+ doins "${DISTDIR}"/${DOC_P}*pdf
fi
}
1.167 dev-python/numpy/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.167&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.167&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?r1=1.166&r2=1.167
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- ChangeLog 28 Jun 2012 21:16:40 -0000 1.166
+++ ChangeLog 28 Jun 2012 21:59:22 -0000 1.167
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/numpy
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.166 2012/06/28 21:16:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.167 2012/06/28 21:59:22 floppym Exp $
+
+ 28 Jun 2012; Mike Gilbert <floppym@gentoo.org> numpy-1.6.2.ebuild:
+ Cleanup die usage for EAPI 4.
28 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org> numpy-1.6.2.ebuild:
Cleaned up a bit the pkg-config mangling for blas/lapack. Hack to strip -lm
@@ -667,4 +670,3 @@
07 Feb 2006; Alastair Tse <liquidx@gentoo.org> +numpy-0.9.4.ebuild:
initial ebuild thanks to Alok Singhal (#119305)
-
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/numpy: numpy-1.6.2.ebuild ChangeLog
@ 2012-12-16 16:27 Agostino Sarubbo (ago)
0 siblings, 0 replies; 4+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-12-16 16:27 UTC (permalink / raw
To: gentoo-commits
ago 12/12/16 16:27:22
Modified: numpy-1.6.2.ebuild ChangeLog
Log:
Stable for x86, wrt bug #446340
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.11 dev-python/numpy/numpy-1.6.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?r1=1.10&r2=1.11
Index: numpy-1.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- numpy-1.6.2.ebuild 9 Dec 2012 22:50:19 -0000 1.10
+++ numpy-1.6.2.ebuild 16 Dec 2012 16:27:22 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.10 2012/12/09 22:50:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.11 2012/12/16 16:27:22 ago Exp $
EAPI=4
@@ -25,7 +25,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack test"
RDEPEND="
1.177 dev-python/numpy/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.177&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.177&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?r1=1.176&r2=1.177
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- ChangeLog 9 Dec 2012 22:50:19 -0000 1.176
+++ ChangeLog 16 Dec 2012 16:27:22 -0000 1.177
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/numpy
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.176 2012/12/09 22:50:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.177 2012/12/16 16:27:22 ago Exp $
+
+ 16 Dec 2012; Agostino Sarubbo <ago@gentoo.org> numpy-1.6.2.ebuild:
+ Stable for x86, wrt bug #446340
09 Dec 2012; Agostino Sarubbo <ago@gentoo.org> numpy-1.6.2.ebuild:
Stable for ppc64, wrt bug #446340
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/numpy: numpy-1.6.2.ebuild ChangeLog
@ 2012-12-18 19:45 Agostino Sarubbo (ago)
0 siblings, 0 replies; 4+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-12-18 19:45 UTC (permalink / raw
To: gentoo-commits
ago 12/12/18 19:45:39
Modified: numpy-1.6.2.ebuild ChangeLog
Log:
Stable for ia64, wrt bug #446340
(Portage version: 2.1.11.31/cvs/Linux ia64, unsigned Manifest commit)
Revision Changes Path
1.13 dev-python/numpy/numpy-1.6.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild?r1=1.12&r2=1.13
Index: numpy-1.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- numpy-1.6.2.ebuild 17 Dec 2012 20:41:32 -0000 1.12
+++ numpy-1.6.2.ebuild 18 Dec 2012 19:45:39 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.12 2012/12/17 20:41:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.13 2012/12/18 19:45:39 ago Exp $
EAPI=4
@@ -25,7 +25,7 @@
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack test"
RDEPEND="
1.179 dev-python/numpy/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.179&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?rev=1.179&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/numpy/ChangeLog?r1=1.178&r2=1.179
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- ChangeLog 17 Dec 2012 20:41:32 -0000 1.178
+++ ChangeLog 18 Dec 2012 19:45:39 -0000 1.179
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/numpy
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.178 2012/12/17 20:41:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.179 2012/12/18 19:45:39 ago Exp $
+
+ 18 Dec 2012; Agostino Sarubbo <ago@gentoo.org> numpy-1.6.2.ebuild:
+ Stable for ia64, wrt bug #446340
17 Dec 2012; Markus Meier <maekke@gentoo.org> numpy-1.6.2.ebuild:
arm stable, bug #446340
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-12-18 19:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-28 21:16 [gentoo-commits] gentoo-x86 commit in dev-python/numpy: numpy-1.6.2.ebuild ChangeLog Sebastien Fabbro (bicatali)
-- strict thread matches above, loose matches on Subject: below --
2012-06-28 21:59 Mike Gilbert (floppym)
2012-12-16 16:27 Agostino Sarubbo (ago)
2012-12-18 19:45 Agostino Sarubbo (ago)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox