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.

Package-Manager: portage-2.1.2_pre1

5 files changed, 53 insertions, 35 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/Manifest b/dev-python/numpy/Manifest
index c8fc36fc4704..2ff07d0a3325 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,22 +1,22 @@
 DIST numpy-0.9.8.tar.gz 985088 RMD160 6059d103ae0c89f946da906f0cddcb9cd1f6b59b SHA1 d468f66849f8672a611004a64726fc6ea7195c83 SHA256 1cac3bb08d5a64b9877eb458b7235bf33bdb591136cb08e4561b6210756750c1
 DIST numpy-1.0b2.tar.gz 1094555 RMD160 1d0e90d87af7711ff7d7bea3e4270a41738d7dd4 SHA1 79592226424abd670dda1a0a69a24b5a1f256f33 SHA256 8f7ee8b75349102170169c1ca6c652341708d9137a35196d6505dd47ea608f49
 DIST numpy-1.0rc1.tar.gz 1120453 RMD160 2a08da4e7f9ea9c5ff8f43d3af63bd2af1218704 SHA1 3a046507eaee5c75c2808c8b726e089196efea35 SHA256 af994dacc3e58beb51876b6d465fe5ca7435d945475ce382388453070102bb5c
-EBUILD numpy-0.9.8.ebuild 1520 RMD160 544441317cf98429a8ee692537226338071527d0 SHA1 23c307b66dd6e4e95bf286866968d4fe0b69a7aa SHA256 0d3f0097536e4c60859aaa33977b3cb602c0995e6b0558cc9bcea2bbdee18f94
-MD5 a4fb85a2e365d9b2925789aa09f18fab numpy-0.9.8.ebuild 1520
-RMD160 544441317cf98429a8ee692537226338071527d0 numpy-0.9.8.ebuild 1520
-SHA256 0d3f0097536e4c60859aaa33977b3cb602c0995e6b0558cc9bcea2bbdee18f94 numpy-0.9.8.ebuild 1520
-EBUILD numpy-1.0_beta2.ebuild 1441 RMD160 4120516fa9ae05043afe95e45ab56ec798ca6c86 SHA1 3e4842e798c98c4484a9856a3dc16a07e71475b8 SHA256 05572cbeca249323b2d3ed934ca9f6f5ca4da5c61e38f3a64a507556302f7382
-MD5 9e77a90c36e83bf09983eb5903568815 numpy-1.0_beta2.ebuild 1441
-RMD160 4120516fa9ae05043afe95e45ab56ec798ca6c86 numpy-1.0_beta2.ebuild 1441
-SHA256 05572cbeca249323b2d3ed934ca9f6f5ca4da5c61e38f3a64a507556302f7382 numpy-1.0_beta2.ebuild 1441
-EBUILD numpy-1.0_rc1.ebuild 1454 RMD160 1bda1a00e9b0023e014492b5cada48ee98b69ce0 SHA1 1f61a9391fb6d4c1d4bce0534b29e89fc4ca85fc SHA256 05495293ca434160e852bb663eab86866fed5bd1de000964150f5a2da598d55d
-MD5 91be12320c5df9f0286c4ea036fce60c numpy-1.0_rc1.ebuild 1454
-RMD160 1bda1a00e9b0023e014492b5cada48ee98b69ce0 numpy-1.0_rc1.ebuild 1454
-SHA256 05495293ca434160e852bb663eab86866fed5bd1de000964150f5a2da598d55d numpy-1.0_rc1.ebuild 1454
-MISC ChangeLog 2435 RMD160 85a6211b54bd0bff809ad717c4b8dad2ea785073 SHA1 91f4848ce452112fbbc8a466dbcc570a21023944 SHA256 f13639420a88ba4fd1d07555327d22f6a37fac3d1a08d6e7561a327230ac5b0b
-MD5 0d976cb57a03815041ef02cffb9841c7 ChangeLog 2435
-RMD160 85a6211b54bd0bff809ad717c4b8dad2ea785073 ChangeLog 2435
-SHA256 f13639420a88ba4fd1d07555327d22f6a37fac3d1a08d6e7561a327230ac5b0b ChangeLog 2435
+EBUILD numpy-0.9.8.ebuild 1559 RMD160 3b45cdbb0bfd3cb14ef0b4b633582dcce7a95c9a SHA1 23583679b140627538d69f69e8972397106696aa SHA256 e49c7a5d3606745d8ccf85d19701f2cb682aa12ba02b660696c48b0d96852100
+MD5 8f2251cf1ae3e5e494c379e0f335c5b5 numpy-0.9.8.ebuild 1559
+RMD160 3b45cdbb0bfd3cb14ef0b4b633582dcce7a95c9a numpy-0.9.8.ebuild 1559
+SHA256 e49c7a5d3606745d8ccf85d19701f2cb682aa12ba02b660696c48b0d96852100 numpy-0.9.8.ebuild 1559
+EBUILD numpy-1.0_beta2.ebuild 1480 RMD160 70b8981e0349ec31a8b1ed688b62282fb1302059 SHA1 f55df5efaf347eb0036977f32c54908521e7b4f2 SHA256 ff3473cadc168ac1ba4eecf63d676304a2857f1e32aa776c20a3eec2d04c70a3
+MD5 020102f39ee36fa80fa7dbe85fcceb3f numpy-1.0_beta2.ebuild 1480
+RMD160 70b8981e0349ec31a8b1ed688b62282fb1302059 numpy-1.0_beta2.ebuild 1480
+SHA256 ff3473cadc168ac1ba4eecf63d676304a2857f1e32aa776c20a3eec2d04c70a3 numpy-1.0_beta2.ebuild 1480
+EBUILD numpy-1.0_rc1.ebuild 1493 RMD160 efaf3384ce910c4d5c8aaa11c7c1bf719d46e02e SHA1 7a61591a0b41d4b0813662bfcd2ae4b71ce1d660 SHA256 b032a1448447f58dcde200d626d6a52488a04428e80557c7e76550373d9d3be9
+MD5 d6a4a39100c02f44101f2d6d3750f14c numpy-1.0_rc1.ebuild 1493
+RMD160 efaf3384ce910c4d5c8aaa11c7c1bf719d46e02e numpy-1.0_rc1.ebuild 1493
+SHA256 b032a1448447f58dcde200d626d6a52488a04428e80557c7e76550373d9d3be9 numpy-1.0_rc1.ebuild 1493
+MISC ChangeLog 2783 RMD160 bc2470eeb2f8e082eedd13119cc00a97c7a1be88 SHA1 d467a248426eb77a2e0cdd909a14c883aaf2b618 SHA256 10dc533d3d0ac982cd738568a6a7699e3e4bf373e320bfe2527cb61075ee7bfb
+MD5 0407cfedb23dd79a3227ad8971c480cd ChangeLog 2783
+RMD160 bc2470eeb2f8e082eedd13119cc00a97c7a1be88 ChangeLog 2783
+SHA256 10dc533d3d0ac982cd738568a6a7699e3e4bf373e320bfe2527cb61075ee7bfb ChangeLog 2783
 MISC metadata.xml 617 RMD160 fcb64d876af5dffc1a1cc308f6e76a3ff3525244 SHA1 5e056fcc834226a96a9a7197ba2f2c0c076634d5 SHA256 eda38840db709ec1460753d542150351bcd8eaf235fcd58252e45712d64cad6a
 MD5 9251edbaa605d72f2c04cc0a5b4f9a84 metadata.xml 617
 RMD160 fcb64d876af5dffc1a1cc308f6e76a3ff3525244 metadata.xml 617
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/*