[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/, sys-cluster/ceph/

["Patrick Lauer" <patrick@gentoo.org>]

commit:     e0728e24f29a6de82909cda5d81017e7900ea8c4
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 11:52:30 2024 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 11:52:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0728e24

sys-cluster/ceph: Fix build with use=spdk

Tests don't build, but we don't even run the tests.
Exclude tests from build.

Closes: https://bugs.gentoo.org/936889
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 sys-cluster/ceph/ceph-18.2.4-r2.ebuild        |  1 +
 sys-cluster/ceph/ceph-19.2.0.ebuild           |  3 +++
 sys-cluster/ceph/files/ceph-18.2.4-spdk.patch | 13 +++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/sys-cluster/ceph/ceph-18.2.4-r2.ebuild b/sys-cluster/ceph/ceph-18.2.4-r2.ebuild
index f23e56039cf6..9684c2b6a87a 100644
--- a/sys-cluster/ceph/ceph-18.2.4-r2.ebuild
+++ b/sys-cluster/ceph/ceph-18.2.4-r2.ebuild
@@ -234,6 +234,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-18.2.1-gcc14.patch"
 	"${FILESDIR}/ceph-18.2.1-gcc14-2.patch"
 	"${FILESDIR}/ceph-18.2.4-liburing.patch"
+	"${FILESDIR}/ceph-18.2.4-spdk.patch"
 )
 
 check-reqs_export_vars() {

diff --git a/sys-cluster/ceph/ceph-19.2.0.ebuild b/sys-cluster/ceph/ceph-19.2.0.ebuild
index 05634a309b86..24a94bc4b788 100644
--- a/sys-cluster/ceph/ceph-19.2.0.ebuild
+++ b/sys-cluster/ceph/ceph-19.2.0.ebuild
@@ -230,6 +230,7 @@ PATCHES=(
 	# https://bugs.gentoo.org/936889
 	"${FILESDIR}/ceph-18.2.1-gcc14.patch"
 	"${FILESDIR}/ceph-18.2.4-liburing.patch"
+	"${FILESDIR}/ceph-18.2.4-spdk.patch"
 )
 
 check-reqs_export_vars() {
@@ -289,6 +290,8 @@ src_prepare() {
 	if use spdk; then
 		# https://bugs.gentoo.org/871942
 		sed -i 's/[#]ifndef HAVE_ARC4RANDOM/#if 0/' src/spdk/lib/iscsi/iscsi.c || die
+		# unittests fail to build (??!?)
+		sed -i -e 's/CONFIG_UNIT_TESTS=y/CONFIG_UNIT_TESTS=n/' src/spdk/CONFIG || die
 	fi
 
 	# remove tests that need root access

diff --git a/sys-cluster/ceph/files/ceph-18.2.4-spdk.patch b/sys-cluster/ceph/files/ceph-18.2.4-spdk.patch
new file mode 100644
index 000000000000..27fb3c6eaa89
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-18.2.4-spdk.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/BuildSPDK.cmake b/cmake/modules/BuildSPDK.cmake
+index d6ce97e..0c49e05 100644
+--- a/cmake/modules/BuildSPDK.cmake
++++ b/cmake/modules/BuildSPDK.cmake
+@@ -51,6 +51,8 @@ macro(build_spdk)
+       --with-dpdk=${DPDK_DIR}
+       --without-isal
+       --without-vhost
++      --disable-tests
++      --disable-unit-tests
+       --target-arch=${target_arch}
+     # unset $CFLAGS, otherwise it will interfere with how SPDK sets
+     # its include directory.