From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1537215-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 0032915800A
for <garchives@archives.gentoo.org>; Thu, 13 Jul 2023 18:56:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 36E49E0784;
Thu, 13 Jul 2023 18:56:05 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0F7AAE0784
for <gentoo-commits@lists.gentoo.org>; Thu, 13 Jul 2023 18:56:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C2243335CB4
for <gentoo-commits@lists.gentoo.org>; Thu, 13 Jul 2023 18:56:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DE270ACE
for <gentoo-commits@lists.gentoo.org>; Thu, 13 Jul 2023 18:56:01 +0000 (UTC)
From: "Michael Orlitzky" <mjo@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, "Michael Orlitzky" <mjo@gentoo.org>
Message-ID: <1689274497.0bb4197bb27d2103d9cd548d43ee7bd77942f51b.mjo@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/openblas/files/, sci-libs/openblas/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/openblas/files/openblas-0.3.23-parallel-make.patch sci-libs/openblas/openblas-0.3.23.ebuild
X-VCS-Directories: sci-libs/openblas/files/ sci-libs/openblas/
X-VCS-Committer: mjo
X-VCS-Committer-Name: Michael Orlitzky
X-VCS-Revision: 0bb4197bb27d2103d9cd548d43ee7bd77942f51b
X-VCS-Branch: master
Date: Thu, 13 Jul 2023 18:56:01 +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: fe5e586f-6eae-4a62-a819-77b2018eea47
X-Archives-Hash: 7af900fa83f061452d9eb53753bf0a3f
commit: 0bb4197bb27d2103d9cd548d43ee7bd77942f51b
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 18:31:54 2023 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 18:54:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bb4197b
sci-libs/openblas: improved parallel build fix.
Bug: https://bugs.gentoo.org/910174
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../files/openblas-0.3.23-parallel-make.patch | 67 ++++++++++++++++++++++
sci-libs/openblas/openblas-0.3.23.ebuild | 4 +-
2 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/sci-libs/openblas/files/openblas-0.3.23-parallel-make.patch b/sci-libs/openblas/files/openblas-0.3.23-parallel-make.patch
new file mode 100644
index 000000000000..ce0487a6b2c0
--- /dev/null
+++ b/sci-libs/openblas/files/openblas-0.3.23-parallel-make.patch
@@ -0,0 +1,67 @@
+From 281e834566a06f1c756d262dc31e809faaf8933f Mon Sep 17 00:00:00 2001
+From: Guillaume Horel <guillaume.horel@gmail.com>
+Date: Thu, 30 Mar 2023 15:15:25 -0400
+Subject: [PATCH 1/2] do not pass -j flag to the MAKE variable
+
+---
+ getarch.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/getarch.c b/getarch.c
+index 937a8db68c..87384c0840 100644
+--- a/getarch.c
++++ b/getarch.c
+@@ -1930,15 +1930,15 @@ printf("ELF_VERSION=2\n");
+
+ #ifdef MAKE_NB_JOBS
+ #if MAKE_NB_JOBS > 0
+- printf("MAKE += -j %d\n", MAKE_NB_JOBS);
++ printf("MAKEFLAGS += -j %d\n", MAKE_NB_JOBS);
+ #else
+ // Let make use parent -j argument or -j1 if there
+ // is no make parent
+ #endif
+ #elif NO_PARALLEL_MAKE==1
+- printf("MAKE += -j 1\n");
++ printf("MAKEFLAGS += -j 1\n");
+ #else
+- printf("MAKE += -j %d\n", get_num_cores());
++ printf("MAKEFLAGS += -j %d\n", get_num_cores());
+ #endif
+
+ break;
+
+From 397108fba299c87ce17957452d57469af914f516 Mon Sep 17 00:00:00 2001
+From: Guillaume Horel <guillaume.horel@gmail.com>
+Date: Fri, 31 Mar 2023 09:22:40 -0400
+Subject: [PATCH 2/2] serialize shared prerequisites
+
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 144b3400db..3c4b8948af 100644
+--- a/Makefile
++++ b/Makefile
+@@ -40,9 +40,9 @@ LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS))
+ SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test
+
+ .PHONY : all libs netlib $(RELA) test ctest shared install
+-.NOTPARALLEL : all libs $(RELA) prof lapack-test install blas-test
++.NOTPARALLEL : shared
+
+-all :: libs netlib $(RELA) tests shared
++all :: tests
+ @echo
+ @echo " OpenBLAS build complete. ($(LIB_COMPONENTS))"
+ @echo
+@@ -150,7 +150,7 @@ ifeq ($(OSNAME), CYGWIN_NT)
+ endif
+ endif
+
+-tests : libs netlib $(RELA) shared
++tests : shared
+ ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
+ touch $(LIBNAME)
+ ifndef NO_FBLAS
diff --git a/sci-libs/openblas/openblas-0.3.23.ebuild b/sci-libs/openblas/openblas-0.3.23.ebuild
index 0324e3a62e4c..0e178b25b5a8 100644
--- a/sci-libs/openblas/openblas-0.3.23.ebuild
+++ b/sci-libs/openblas/openblas-0.3.23.ebuild
@@ -28,6 +28,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${PN}-0.3.23-shared-blas-lapack.patch"
"${FILESDIR}/${PN}-0.3.21-fix-loong.patch"
+ "${FILESDIR}/${PN}-0.3.23-parallel-make.patch"
)
pkg_pretend() {
@@ -132,8 +133,7 @@ src_compile() {
}
src_test() {
- # https://github.com/xianyi/OpenBLAS/issues/4139
- emake -j1 tests
+ emake tests
}
src_install() {