gentoo auto-resync : 13:07:2023 - 22:35:45

3 files changed, 71 insertions, 3 deletions

diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 7ef5744bf426..61b5c3ca5505 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,9 +1,10 @@
 AUX openblas-0.3.12-shared-blas-lapack.patch 2008 BLAKE2B 2d3a4a90d8144cbf149b7711b67364176a94287f26448930b5a4fd29fe761fb250e9007c580fb1ffa8148c477e2f4057f9cd8d7aa07efeb85caa842802d358fd SHA512 3f0d4b480549565c838eba6371e0990c162f56a226f9d26e1639e012ae3f39809f8c6badcf8fdfbb1258f45367dbaff9c4c611b8b44bac27d341aea954f0133e
 AUX openblas-0.3.21-clang16.patch 17596 BLAKE2B 29a6d2716e31ad65de3252375c1a11b769c59924d09df190fd458a85dcb4c03fda041255b4239b6f41b9b799805e67bf4940f93e5baced5674eacb141eb6f711 SHA512 2e488295b282a267f5a49aa077331cfd2b35552d6099d22d8f37beb5521ebc1d4d08ba512b3b6d863f42a5f1c25153c74d83dc56be687f32e095fe1ff248bef6
 AUX openblas-0.3.21-fix-loong.patch 7341 BLAKE2B 33bd86e61b8a9d5d7130a4dd3a2d03f2e4ddd9703a3c2d6cf8e31e0af7499ea6128a1b7979f0a347b813292af2dca507d9b06e9ced6ab4e821d5f33ee03e5054 SHA512 c1c19e8965794658baff61bdc9082981b9e69b487c4221837ef10f176b12ee152bad0e37bbd0c347722ee2daf83adb016e75b149dad2b140ad4c631646290642
+AUX openblas-0.3.23-parallel-make.patch 1985 BLAKE2B 044edd52499453a46478ab91676e34e97e4ea94ebd7f155bcba8df205a5bb7450f431cf5f4ce2d326a50479ce243687317752c8abcf6d4c95a3f99952f8b0874 SHA512 85473ecbecfb9612089e370087f3a1d7db353e86302f389065cdec96e49b84b57a4cce635c986ac7dc15daee0fe676e55ea5e2856113807e401bd9fb50bb27ff
 AUX openblas-0.3.23-shared-blas-lapack.patch 2128 BLAKE2B 42e6ac46c9d62609731e3d7efd57569712325fb4f35b0bc1b119f51babf9b728acc569216c784e30980e20accee70baee20850b5600c7e0800ff04f19415cf08 SHA512 c6358b9682e358082bd862bbc376412c5b33bc967153f544fa2514205bcb4841cfbbc61e93932fcd4b0653ded2d5f853d62ac05081fc970fb541f4cc7281768f
 DIST openblas-0.3.21.tar.gz 23729571 BLAKE2B 678bfb13ead69045e7d4d840bbcaed884d9ebedded5425cfa1f55e3d85bda31a3eb43dbbf9f07099d0d198f97ae68ef3b3b2b78aa1bd5b4999dd729dc08f7e28 SHA512 4625c8e6ccfa9120281fd714d3f6b7c3ba2265470c1be76121d6b25dc3dacb899d26e5d9a417ddc616d23909f1411495aa995ef8d8d6df8511cd5cefbabcb1c5
 DIST openblas-0.3.23.tar.gz 23950794 BLAKE2B 8394e09c682bba10450248cbbe090bb81c26661eac7d238942055ae0eecce752c8a3481af905de9efe20fe635f2c4a0e06af83bb64c998ab410e4cdc56751a47 SHA512 ea64c693e57eb63cc2a88e4d6ab2d8cf9ab84ae6a15048fb12090a3570dd41053e62e99c1ff9d3e02dd67ca93233591ab41b8c017d06585d0a69222e1ad3023f
 EBUILD openblas-0.3.21-r1.ebuild 5639 BLAKE2B 9f42f3af66c8d65d208cff75c03df80df9f9337c55a8c52557e9c6fecbc732cf10a47b36d341bafc0960550fbdc989f263d2aa07a04d7cc1911682ec3953c1b4 SHA512 4a663034ad381724dcaaaabe292d5f5c527c0d66c10f8b7f674ec6d66976d75f072299a90162e04379e6426ca0b4a3967b8ca253e0f125053911b37325f2ad9f
-EBUILD openblas-0.3.23.ebuild 5765 BLAKE2B 3fccc7184c83757df4cf62403a8cd3a9aa21b95eca0bf61effe6090956ebe6bc6308be0aabec63d93025d5c4d8e55fb74d8378af93a80c46753a217c363a50ac SHA512 15771a84eab7f8218f4a73bb4a3275c5ded95b1bac2a007a8dd98037d2430af9e68073fcce2554e916b3b2eda95e37921b7df25baa9ea3c3a9ae190ec15af904
+EBUILD openblas-0.3.23.ebuild 5759 BLAKE2B 2df9a3d54c758a6f90e4ba00ad3bd3e8d8865c165f5fd15bb9c5ecab349638bba4b9a93ce11173e90ec9cb9117ad1ea30c4720653dc68ee75e24c4b87b426cbd SHA512 c2ab1ce23ec0f4f83c1a251e19f120087362c598ae9af6b7df6f8489ff3b7253300f4be351747bdb4a6d0983ebb00c009a893be9ffe3a2ffc294d7a349485ce0
 MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48
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() {