[patch] Set OMP_NUM_THREADS=$(makeopts_jobs)

0001-x11-libs-pixman-Limit-test-suite-makeopts_jobs-threa.patch (text/plain), 2.12 KB, created by Matt Turner on 2019-07-11 20:50:40 UTC

From 3363cd6a45c4da51e02acd67155b5f2dcb337d98 Mon Sep 17 00:00:00 2001
From: Matt Turner <[e-mail]>
Date: Tue, 9 Jul 2019 13:16:41 -0700
Subject: [PATCH] x11-libs/pixman: Limit test suite $(makeopts_jobs) threads

Otherwise we would run as many OpenMP threads as there are CPU cores and
ignore MAKEOPTS. Since we're running tests in parallel *and* the tests
spawn multiple threads, we will still exceed $(makeopts_jobs) threads
total, but I don't think that can be helped.

Closes: https://bugs.gentoo.org/688926
Signed-off-by: Matt Turner <[e-mail]>
---
 x11-libs/pixman/pixman-0.38.4.ebuild | 3 ++-
 x11-libs/pixman/pixman-9999.ebuild   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/x11-libs/pixman/pixman-0.38.4.ebuild b/x11-libs/pixman/pixman-0.38.4.ebuild
index b5fcceac957..91bb30113a6 100644
--- a/x11-libs/pixman/pixman-0.38.4.ebuild
+++ b/x11-libs/pixman/pixman-0.38.4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-inherit ${GIT_ECLASS} meson multilib-minimal toolchain-funcs
+inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs
 
 DESCRIPTION="Low-level pixel manipulation routines"
 HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
@@ -54,6 +54,7 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
+	export OMP_NUM_THREADS=$(makeopts_jobs)
 	meson test -v -C "${BUILD_DIR}" -t 100
 }
 
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 0e6923456a8..17ea41af338 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-inherit ${GIT_ECLASS} meson multilib-minimal toolchain-funcs
+inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs
 
 DESCRIPTION="Low-level pixel manipulation routines"
 HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
@@ -54,6 +54,7 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
+	export OMP_NUM_THREADS=$(makeopts_jobs)
 	meson test -v -C "${BUILD_DIR}" -t 100
 }
 
-- 
2.21.0