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 <[email protected]> +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 <[email protected]> +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() {
