From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1075469-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id E798F138334
for <garchives@archives.gentoo.org>; Sun, 3 Mar 2019 16:25:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BDAC5E041F;
Sun, 3 Mar 2019 16:25:44 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 795CBE041F
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Mar 2019 16:25:44 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 72400335CE9
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Mar 2019 16:25:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E182C542
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Mar 2019 16:25:40 +0000 (UTC)
From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" <whissi@gentoo.org>
Message-ID: <1551630331.09f3824f30a37092664909b512043b0321e3d14d.whissi@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/numpy/numpy-1.13.3.ebuild dev-python/numpy/numpy-1.14.5.ebuild dev-python/numpy/numpy-1.15.4.ebuild dev-python/numpy/numpy-1.16.1.ebuild dev-python/numpy/numpy-9999.ebuild
X-VCS-Directories: dev-python/numpy/
X-VCS-Committer: whissi
X-VCS-Committer-Name: Thomas Deutschmann
X-VCS-Revision: 09f3824f30a37092664909b512043b0321e3d14d
X-VCS-Branch: master
Date: Sun, 3 Mar 2019 16:25:40 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: eddc4640-11dd-435f-84ba-35865a00b81d
X-Archives-Hash: 9e938f6843b4b8b12cd3d3abb449f0a4
commit: 09f3824f30a37092664909b512043b0321e3d14d
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 3 16:23:05 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 16:25:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09f3824f
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 <AT> gentoo.org>
dev-python/numpy/numpy-1.13.3.ebuild | 4 ++--
dev-python/numpy/numpy-1.14.5.ebuild | 2 ++
dev-python/numpy/numpy-1.15.4.ebuild | 2 ++
dev-python/numpy/numpy-1.16.1.ebuild | 2 ++
dev-python/numpy/numpy-9999.ebuild | 2 ++
5 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dev-python/numpy/numpy-1.13.3.ebuild b/dev-python/numpy/numpy-1.13.3.ebuild
index 7242f677775..38ab8f14ce3 100644
--- 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 630b5d21ec6..e48e1dc7034 100644
--- 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 321b3a2e672..5e43b353b72 100644
--- 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 bf2f0cc9d3b..ecb913628ef 100644
--- 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 baa28ab5889..7232ea8a951 100644
--- 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}
}