]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rpm: use system libpmem on Centos 9 Stream 46211/head
authorIlya Dryomov <idryomov@gmail.com>
Thu, 10 Mar 2022 17:32:30 +0000 (18:32 +0100)
committerIlya Dryomov <idryomov@gmail.com>
Tue, 10 May 2022 08:44:05 +0000 (10:44 +0200)
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 <idryomov@gmail.com>
(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

index cfd993cfa13172e919d12717ea7383e2387ae837..89ff6181d28afd4fc243f1be77b5c12eeaf7800c 100644 (file)
 %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