From 2d8e6a13cf2328d89de2cb5ef4f1df2c67a0a3b5 Mon Sep 17 00:00:00 2001 From: "Z. Liu" Date: Wed, 16 Apr 2025 13:02:20 +0800 Subject: [PATCH] sys-cluster/ceph: respect MAKEOPTS (partly) ninja call cmake, the final solution could be to call "cmake --build" instead of "ninja ..." at the top level. Closes: https://bugs.gentoo.org/924998 Signed-off-by: Z. Liu Part-of: https://github.com/gentoo/gentoo/pull/41614 Closes: https://github.com/gentoo/gentoo/pull/41614 Signed-off-by: Sam James --- sys-cluster/ceph/ceph-18.2.4-r4.ebuild | 3 ++- sys-cluster/ceph/ceph-19.2.0-r3.ebuild | 3 ++- sys-cluster/ceph/ceph-19.2.1-r2.ebuild | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys-cluster/ceph/ceph-18.2.4-r4.ebuild b/sys-cluster/ceph/ceph-18.2.4-r4.ebuild index 5ff77f4bdc823..a8425f122af11 100644 --- a/sys-cluster/ceph/ceph-18.2.4-r4.ebuild +++ b/sys-cluster/ceph/ceph-18.2.4-r4.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) LUA_COMPAT=( lua5-{3..4} ) -inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single \ +inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single multiprocessing \ python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles XSIMD_HASH="aeec9c872c8b475dedd7781336710f2dd2666cb2" @@ -414,6 +414,7 @@ src_configure() { } src_compile() { + export CMAKE_BUILD_PARALLEL_LEVEL=$(makeopts_jobs) cmake_build all # we have to do this here to prevent from building everything multiple times diff --git a/sys-cluster/ceph/ceph-19.2.0-r3.ebuild b/sys-cluster/ceph/ceph-19.2.0-r3.ebuild index ed6a7ba4d1718..bd46c46606670 100644 --- a/sys-cluster/ceph/ceph-19.2.0-r3.ebuild +++ b/sys-cluster/ceph/ceph-19.2.0-r3.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) LUA_COMPAT=( lua5-{3..4} ) -inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single \ +inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single multiprocessing \ python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles XSIMD_HASH="aeec9c872c8b475dedd7781336710f2dd2666cb2" @@ -423,6 +423,7 @@ src_configure() { } src_compile() { + export CMAKE_BUILD_PARALLEL_LEVEL=$(makeopts_jobs) cmake_build all # we have to do this here to prevent from building everything multiple times diff --git a/sys-cluster/ceph/ceph-19.2.1-r2.ebuild b/sys-cluster/ceph/ceph-19.2.1-r2.ebuild index 2b979e4ae6b7f..a8e09636b8bbc 100644 --- a/sys-cluster/ceph/ceph-19.2.1-r2.ebuild +++ b/sys-cluster/ceph/ceph-19.2.1-r2.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) LUA_COMPAT=( lua5-{3..4} ) -inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single \ +inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single multiprocessing \ python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles XSIMD_HASH="aeec9c872c8b475dedd7781336710f2dd2666cb2" @@ -430,6 +430,7 @@ src_configure() { } src_compile() { + export CMAKE_BUILD_PARALLEL_LEVEL=$(makeopts_jobs) cmake_build all # we have to do this here to prevent from building everything multiple times