dev-python/numpy: re-add parallel make workaround for USE=-lapack

Bug: https://bugs.gentoo.org/660754
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/dev-python/numpy/numpy-1.13.3.ebuild b/dev-python/numpy/numpy-1.13.3.ebuild
index 7242f6777759d16d576a1fb6f79f64fb39e1a6fb..38ab8f14ce324d84ec5d8071bf916f2fd3ce4e3a 100644 (file)
--- a/dev-python/numpy/numpy-1.13.3.ebuild
+++ b/dev-python/numpy/numpy-1.13.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -127,7 +127,7 @@ python_prepare_all() {
 }
 
 python_compile() {
-       export MAKEOPTS=-j1 # bug #660754
+       use !lapack && export MAKEOPTS=-j1 #660754
 
        local python_makeopts_jobs=""
        python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"

diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild
index 630b5d21ec6950fcfd34ca5255fbcddb1309b7a7..e48e1dc70343ea01fc98c8d67108b1e153b96e32 100644 (file)
--- a/dev-python/numpy/numpy-1.14.5.ebuild
+++ b/dev-python/numpy/numpy-1.14.5.ebuild
@@ -114,6 +114,8 @@ python_prepare_all() {
 }
 
 python_compile() {
+       use !lapack && export MAKEOPTS=-j1 #660754
+
        local python_makeopts_jobs=""
        python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
        distutils-r1_python_compile \

diff --git a/dev-python/numpy/numpy-1.15.4.ebuild b/dev-python/numpy/numpy-1.15.4.ebuild
index 321b3a2e67227a7c32262cd9736d6d85641ecd48..5e43b353b72460436316560ccc0e56b6e37bc46c 100644 (file)
--- a/dev-python/numpy/numpy-1.15.4.ebuild
+++ b/dev-python/numpy/numpy-1.15.4.ebuild
@@ -109,6 +109,8 @@ python_prepare_all() {
 }
 
 python_compile() {
+       use !lapack && export MAKEOPTS=-j1 #660754
+
        local python_makeopts_jobs=""
        python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
        distutils-r1_python_compile \

diff --git a/dev-python/numpy/numpy-1.16.1.ebuild b/dev-python/numpy/numpy-1.16.1.ebuild
index bf2f0cc9d3b7d76a77bf1d8605499f743e0f7ad2..ecb913628ef64864fb4d8df60448f768e56d71ba 100644 (file)
--- a/dev-python/numpy/numpy-1.16.1.ebuild
+++ b/dev-python/numpy/numpy-1.16.1.ebuild
@@ -112,6 +112,8 @@ python_prepare_all() {
 }
 
 python_compile() {
+       use !lapack && export MAKEOPTS=-j1 #660754
+
        local python_makeopts_jobs=""
        python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
        distutils-r1_python_compile \

diff --git a/dev-python/numpy/numpy-9999.ebuild b/dev-python/numpy/numpy-9999.ebuild
index baa28ab5889315d04aa3c5e791fdd10a9472dcaf..7232ea8a951ed575b98e8e69148f011e37655ffd 100644 (file)
--- a/dev-python/numpy/numpy-9999.ebuild
+++ b/dev-python/numpy/numpy-9999.ebuild
@@ -104,6 +104,8 @@ python_prepare_all() {
 }
 
 python_compile() {
+       use !lapack && export MAKEOPTS=-j1 #660754
+
        distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
 }