From 621111ca08c532cdd07238d9ed0f5470388651d4 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 10 Mar 2022 18:32:30 +0100 Subject: [PATCH] rpm: use system libpmem on Centos 9 Stream We need libpmem 1.10 and Centos 9 Stream has it. On top of sticking to distro-provided packages being generally a good thing, this fixes a build failure: libpmem 1.10 doesn't build with LTO which is enabled by default in Centos 9 Stream. The distro package works around it. libpmem 1.10 is also there in Fedora 34 and Fedora 35. Fixes: https://tracker.ceph.com/issues/54473 Signed-off-by: Ilya Dryomov (cherry picked from commit 09440364731b35d5b47922a196df173d306e11dc) Conflicts: ceph.spec.in [ commit 1a3a1b095865 ("rpm: enable system_pmdk bcond for SUSE builds") not in pacific ] --- ceph.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index cfd993cfa131..89ff6181d28a 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -29,7 +29,11 @@ %else %bcond_without tcmalloc %endif +%if 0%{?rhel} >= 9 +%bcond_without system_pmdk +%else %bcond_with system_pmdk +%endif %if 0%{?fedora} || 0%{?rhel} %bcond_without selinux %ifarch x86_64 ppc64le -- 2.47.3