Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/, sys-cluster/ceph/
Date: Mon, 01 Jun 2020 19:14:57
Message-Id: 1591038888.8f0f8a7ad1f00acef2416ea918d0b6ed978a8e63.chutzpah@gentoo
1 commit: 8f0f8a7ad1f00acef2416ea918d0b6ed978a8e63
2 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
3 AuthorDate: Mon Jun 1 19:14:09 2020 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 1 19:14:48 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0f8a7a
7
8 sys-cluster/ceph-15.2.3: Fix build with USE=spdk
9
10 Copyright: Sony Interactive Entertainment Inc.
11 Package-Manager: Portage-2.3.100, Repoman-2.3.22
12 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
13
14 sys-cluster/ceph/ceph-15.2.3.ebuild | 1 +
15 sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch | 9 +++++++++
16 2 files changed, 10 insertions(+)
17
18 diff --git a/sys-cluster/ceph/ceph-15.2.3.ebuild b/sys-cluster/ceph/ceph-15.2.3.ebuild
19 index 6b0fa3f4c3b..dc22c44fea6 100644
20 --- a/sys-cluster/ceph/ceph-15.2.3.ebuild
21 +++ b/sys-cluster/ceph/ceph-15.2.3.ebuild
22 @@ -194,6 +194,7 @@ PATCHES=(
23 "${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
24 "${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch"
25 "${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
26 + "${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
27 )
28
29 check-reqs_export_vars() {
30
31 diff --git a/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch b/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch
32 new file mode 100644
33 index 00000000000..3ea6eadbb86
34 --- /dev/null
35 +++ b/sys-cluster/ceph/files/ceph-15.2.3-spdk-compile.patch
36 @@ -0,0 +1,9 @@
37 +--- ceph-15.2.3.orig/cmake/modules/BuildSPDK.cmake 2020-05-29 09:24:50.000000000 -0700
38 ++++ ceph-15.2.3/cmake/modules/BuildSPDK.cmake 2020-06-01 10:36:14.629306433 -0700
39 +@@ -1,5 +1,5 @@
40 + macro(build_spdk)
41 +- set(DPDK_DIR ${CMAKE_BINARY_DIR}/src/dpdk)
42 ++ set(DPDK_DIR ${CMAKE_SOURCE_DIR}/src/dpdk)
43 + if(NOT TARGET dpdk-ext)
44 + include(BuildDPDK)
45 + build_dpdk(${DPDK_DIR})