| 1 |
commit: 09f3824f30a37092664909b512043b0321e3d14d |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 3 16:23:05 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 3 16:25:31 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09f3824f |
| 7 |
|
| 8 |
dev-python/numpy: re-add parallel make workaround for USE=-lapack |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/660754 |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-python/numpy/numpy-1.13.3.ebuild | 4 ++-- |
| 15 |
dev-python/numpy/numpy-1.14.5.ebuild | 2 ++ |
| 16 |
dev-python/numpy/numpy-1.15.4.ebuild | 2 ++ |
| 17 |
dev-python/numpy/numpy-1.16.1.ebuild | 2 ++ |
| 18 |
dev-python/numpy/numpy-9999.ebuild | 2 ++ |
| 19 |
5 files changed, 10 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-python/numpy/numpy-1.13.3.ebuild b/dev-python/numpy/numpy-1.13.3.ebuild |
| 22 |
index 7242f677775..38ab8f14ce3 100644 |
| 23 |
--- a/dev-python/numpy/numpy-1.13.3.ebuild |
| 24 |
+++ b/dev-python/numpy/numpy-1.13.3.ebuild |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-# Copyright 1999-2018 Gentoo Foundation |
| 27 |
+# Copyright 1999-2019 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
EAPI=6 |
| 31 |
@@ -127,7 +127,7 @@ python_prepare_all() { |
| 32 |
} |
| 33 |
|
| 34 |
python_compile() { |
| 35 |
- export MAKEOPTS=-j1 # bug #660754 |
| 36 |
+ use !lapack && export MAKEOPTS=-j1 #660754 |
| 37 |
|
| 38 |
local python_makeopts_jobs="" |
| 39 |
python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)" |
| 40 |
|
| 41 |
diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild |
| 42 |
index 630b5d21ec6..e48e1dc7034 100644 |
| 43 |
--- a/dev-python/numpy/numpy-1.14.5.ebuild |
| 44 |
+++ b/dev-python/numpy/numpy-1.14.5.ebuild |
| 45 |
@@ -114,6 +114,8 @@ python_prepare_all() { |
| 46 |
} |
| 47 |
|
| 48 |
python_compile() { |
| 49 |
+ use !lapack && export MAKEOPTS=-j1 #660754 |
| 50 |
+ |
| 51 |
local python_makeopts_jobs="" |
| 52 |
python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)" |
| 53 |
distutils-r1_python_compile \ |
| 54 |
|
| 55 |
diff --git a/dev-python/numpy/numpy-1.15.4.ebuild b/dev-python/numpy/numpy-1.15.4.ebuild |
| 56 |
index 321b3a2e672..5e43b353b72 100644 |
| 57 |
--- a/dev-python/numpy/numpy-1.15.4.ebuild |
| 58 |
+++ b/dev-python/numpy/numpy-1.15.4.ebuild |
| 59 |
@@ -109,6 +109,8 @@ python_prepare_all() { |
| 60 |
} |
| 61 |
|
| 62 |
python_compile() { |
| 63 |
+ use !lapack && export MAKEOPTS=-j1 #660754 |
| 64 |
+ |
| 65 |
local python_makeopts_jobs="" |
| 66 |
python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)" |
| 67 |
distutils-r1_python_compile \ |
| 68 |
|
| 69 |
diff --git a/dev-python/numpy/numpy-1.16.1.ebuild b/dev-python/numpy/numpy-1.16.1.ebuild |
| 70 |
index bf2f0cc9d3b..ecb913628ef 100644 |
| 71 |
--- a/dev-python/numpy/numpy-1.16.1.ebuild |
| 72 |
+++ b/dev-python/numpy/numpy-1.16.1.ebuild |
| 73 |
@@ -112,6 +112,8 @@ python_prepare_all() { |
| 74 |
} |
| 75 |
|
| 76 |
python_compile() { |
| 77 |
+ use !lapack && export MAKEOPTS=-j1 #660754 |
| 78 |
+ |
| 79 |
local python_makeopts_jobs="" |
| 80 |
python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)" |
| 81 |
distutils-r1_python_compile \ |
| 82 |
|
| 83 |
diff --git a/dev-python/numpy/numpy-9999.ebuild b/dev-python/numpy/numpy-9999.ebuild |
| 84 |
index baa28ab5889..7232ea8a951 100644 |
| 85 |
--- a/dev-python/numpy/numpy-9999.ebuild |
| 86 |
+++ b/dev-python/numpy/numpy-9999.ebuild |
| 87 |
@@ -104,6 +104,8 @@ python_prepare_all() { |
| 88 |
} |
| 89 |
|
| 90 |
python_compile() { |
| 91 |
+ use !lapack && export MAKEOPTS=-j1 #660754 |
| 92 |
+ |
| 93 |
distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG} |
| 94 |
} |
Archives