summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-09-24 01:03:17 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-09-24 01:03:17 +0000
commit0c2b65d9b9bd797e1b589895ccd3d92992e00bc2 (patch)
tree184aadbcaa1f204a79939a12d699efeedd6e0f2f /dev-python/numpy
parentqa fix - missing USE flag (diff)
downloadgentoo-2-0c2b65d9b9bd797e1b589895ccd3d92992e00bc2.tar.gz
gentoo-2-0c2b65d9b9bd797e1b589895ccd3d92992e00bc2.tar.bz2
gentoo-2-0c2b65d9b9bd797e1b589895ccd3d92992e00bc2.zip
The LDFLAGS situation is worse than I thought. Setting LDFLAGS at all entirely overrides the linker flags within the build and breaks it. See comp.lang.python thread 'Building things with setup.py' from 21 Sept. 2006.
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'dev-python/numpy')
-rw-r--r--dev-python/numpy/ChangeLog8
-rw-r--r--dev-python/numpy/numpy-0.9.8.ebuild16
-rw-r--r--dev-python/numpy/numpy-1.0_beta2.ebuild16
-rw-r--r--dev-python/numpy/numpy-1.0_rc1.ebuild16
4 files changed, 37 insertions, 19 deletions
diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 554dabfdc7a2..40de8e2e698f 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/numpy
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.14 2006/09/22 03:21:52 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.15 2006/09/24 01:03:17 dberkholz Exp $
+
+ 24 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; numpy-0.9.8.ebuild,
+ numpy-1.0_beta2.ebuild, numpy-1.0_rc1.ebuild:
+ The LDFLAGS situation is worse than I thought. Setting LDFLAGS at all
+ entirely overrides the linker flags within the build and breaks it. See
+ comp.lang.python thread 'Building things with setup.py' from 21 Sept. 2006.
22 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
-files/0.9.6-recognize-more-gfortran-versions.patch:
diff --git a/dev-python/numpy/numpy-0.9.8.ebuild b/dev-python/numpy/numpy-0.9.8.ebuild
index a288160d2c62..09d4a7a7ea3e 100644
--- a/dev-python/numpy/numpy-0.9.8.ebuild
+++ b/dev-python/numpy/numpy-0.9.8.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-0.9.8.ebuild,v 1.4 2006/09/21 18:49:12 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-0.9.8.ebuild,v 1.5 2006/09/24 01:03:17 dberkholz Exp $
-inherit distutils flag-o-matic
+inherit distutils
DESCRIPTION="Multi-dimensional array object and processing for Python."
SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz"
@@ -25,10 +25,6 @@ src_unpack() {
-e "s:f77blas:blas:g" \
numpy/distutils/system_info.py
- # -Wl,-O1 breaks the compilation
- filter-ldflags -O1
- filter-ldflags -Wl,-O1
-
if use lapack; then
echo "[atlas]" > site.cfg
echo "include_dirs = /usr/include/atlas" >> site.cfg
@@ -44,6 +40,14 @@ src_unpack() {
fi
}
+src_compile() {
+ # http://projects.scipy.org/scipy/numpy/ticket/182
+ # Can't set LDFLAGS
+ unset LDFLAGS
+
+ distutils_src_compile
+}
+
# The test only works after install
# To be worked out.
#src_test() {
diff --git a/dev-python/numpy/numpy-1.0_beta2.ebuild b/dev-python/numpy/numpy-1.0_beta2.ebuild
index aa6b17b4aecb..975f92081d4a 100644
--- a/dev-python/numpy/numpy-1.0_beta2.ebuild
+++ b/dev-python/numpy/numpy-1.0_beta2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0_beta2.ebuild,v 1.3 2006/09/21 18:49:12 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0_beta2.ebuild,v 1.4 2006/09/24 01:03:17 dberkholz Exp $
-inherit distutils flag-o-matic
+inherit distutils
MY_P=${P/_beta/b}
DESCRIPTION="Multi-dimensional array object and processing for Python."
@@ -28,10 +28,6 @@ src_unpack() {
-e "s:f77blas:blas:g" \
numpy/distutils/system_info.py
- # -Wl,-O1 breaks the compilation
- filter-ldflags -O1
- filter-ldflags -Wl,-O1
-
if use lapack; then
echo "[atlas]" > site.cfg
echo "include_dirs = /usr/include/atlas" >> site.cfg
@@ -47,6 +43,14 @@ src_unpack() {
fi
}
+src_compile() {
+ # http://projects.scipy.org/scipy/numpy/ticket/182
+ # Can't set LDFLAGS
+ unset LDFLAGS
+
+ distutils_src_compile
+}
+
src_install() {
distutils_src_install
dodoc numpy/doc/*
diff --git a/dev-python/numpy/numpy-1.0_rc1.ebuild b/dev-python/numpy/numpy-1.0_rc1.ebuild
index 5f14ac843bcc..b91c92ac92b5 100644
--- a/dev-python/numpy/numpy-1.0_rc1.ebuild
+++ b/dev-python/numpy/numpy-1.0_rc1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0_rc1.ebuild,v 1.2 2006/09/21 18:49:12 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0_rc1.ebuild,v 1.3 2006/09/24 01:03:17 dberkholz Exp $
-inherit distutils flag-o-matic
+inherit distutils
MY_P=${P/_beta/b}
MY_P=${MY_P/_}
@@ -29,10 +29,6 @@ src_unpack() {
-e "s:f77blas:blas:g" \
numpy/distutils/system_info.py
- # -Wl,-O1 breaks the compilation
- filter-ldflags -O1
- filter-ldflags -Wl,-O1
-
if use lapack; then
echo "[atlas]" > site.cfg
echo "include_dirs = /usr/include/atlas" >> site.cfg
@@ -48,6 +44,14 @@ src_unpack() {
fi
}
+src_compile() {
+ # http://projects.scipy.org/scipy/numpy/ticket/182
+ # Can't set LDFLAGS
+ unset LDFLAGS
+
+ distutils_src_compile
+}
+
src_install() {
distutils_src_install
dodoc numpy/doc/*