From ecb8d2cae2c063acf4e7e1bffed887d52117762f Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 26 Apr 2021 16:16:30 +0800 Subject: [PATCH] ceph.spec.in: do not build with system pmdk by default we need to use libpmem 1.10 in #40493. without enabling the module stream offering libpmem 1.9.2, we can only have access to libpmem 1.6.1. and fedora 33 only has libpmem 1.9 packaged. the same applies to openSUSE Tumbleweed and openSUSE Leap. so let's stop using libpmem packaged by distro by default, until these distros include libpmem 1.10. Signed-off-by: Kefu Chai --- ceph.spec.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index cfef0f7ece5b7..82295884696ac 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -29,12 +29,12 @@ %else %bcond_without tcmalloc %endif +%bcond_with system_pmdk %if 0%{?fedora} || 0%{?rhel} %bcond_without selinux %ifarch x86_64 ppc64le %bcond_without rbd_rwl_cache %bcond_without rbd_ssd_cache -%global _system_pmdk 1 %else %bcond_with rbd_rwl_cache %bcond_with rbd_ssd_cache @@ -60,12 +60,10 @@ %bcond_with libradosstriper %ifarch x86_64 aarch64 ppc64le %bcond_without lttng -%global _system_pmdk 1 %bcond_without rbd_rwl_cache %bcond_without rbd_ssd_cache %else %bcond_with lttng -%global _system_pmdk 0 %bcond_with rbd_rwl_cache %bcond_with rbd_ssd_cache %endif @@ -280,7 +278,7 @@ BuildRequires: nlohmann_json-devel BuildRequires: libevent-devel BuildRequires: yaml-cpp-devel %endif -%if 0%{?_system_pmdk} +%if 0%{with system_pmdk} BuildRequires: libpmem-devel BuildRequires: libpmemobj-devel %endif @@ -1341,7 +1339,7 @@ cmake .. \ %if 0%{with rbd_ssd_cache} -DWITH_RBD_SSD_CACHE:BOOL=ON \ %endif -%if 0%{?_system_pmdk} +%if 0%{with system_pmdk} -DWITH_SYSTEM_PMDK:BOOL=ON \ %endif %if 0%{?suse_version} -- 2.39.5