From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9928515808B for ; Fri, 4 Oct 2024 11:53:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE800E29E0; Fri, 4 Oct 2024 11:53:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B24ABE29E0 for ; Fri, 4 Oct 2024 11:53:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9636434301F for ; Fri, 4 Oct 2024 11:53:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04C17F32 for ; Fri, 4 Oct 2024 11:53:26 +0000 (UTC) From: "Patrick Lauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick Lauer" Message-ID: <1728042750.e0728e24f29a6de82909cda5d81017e7900ea8c4.patrick@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/, sys-cluster/ceph/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/ceph-18.2.4-r2.ebuild sys-cluster/ceph/ceph-19.2.0.ebuild sys-cluster/ceph/files/ceph-18.2.4-spdk.patch X-VCS-Directories: sys-cluster/ceph/ sys-cluster/ceph/files/ X-VCS-Committer: patrick X-VCS-Committer-Name: Patrick Lauer X-VCS-Revision: e0728e24f29a6de82909cda5d81017e7900ea8c4 X-VCS-Branch: master Date: Fri, 4 Oct 2024 11:53:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ba26a7d5-6f06-4cb3-889e-b54c34fc0c92 X-Archives-Hash: 2da94eacf983390198cce7cab6a2198f commit: e0728e24f29a6de82909cda5d81017e7900ea8c4 Author: Patrick Lauer gentoo org> AuthorDate: Fri Oct 4 11:52:30 2024 +0000 Commit: Patrick Lauer gentoo 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 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.