]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rpm: use updated gperftools 24259/head
authorKefu Chai <kchai@redhat.com>
Mon, 17 Sep 2018 06:09:17 +0000 (14:09 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 25 Sep 2018 05:57:44 +0000 (13:57 +0800)
make sure we only build with the higher version of gperftools on
distros where both 2.4 and 2.6.1 are packaged. see
https://git.centos.org/summary/rpms!gperftools.git . at the time of
writing, gperftools 2.6.1 is packaged for CentOS/RHEL 7, if gperftools
(>= 2.4) is required by Ceph, and user already has this version
installed, when new Ceph packages are installed, the updated gperftools
2.6.1 version won't be installed as a dependency. when launching
Ceph compiled with tcmalloc enabled, we will have

symbol lookup error: ceph-osd: undefined symbol: _ZdaPvm

so, by bumping up the required version of gperftools, the updated
gperftools will be installed.

see https://software.opensuse.org/package/gperftools, openSUSE/SLE offer
2.5. so they are safe at this moment.

Fixes: http://tracker.ceph.com/issues/35969
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e69e50a859acebe0bf854c12a71bfe745e0c1cf6)

ceph.spec.in

index bb394f06b35dddf1fede8bfeb669b6c5b219f62f..41aba6bdfb8482fda83092ad410479baf3d9750b 100644 (file)
@@ -124,8 +124,13 @@ BuildRequires:     fuse-devel
 BuildRequires: gcc-c++
 BuildRequires: gdbm
 %if 0%{with tcmalloc}
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: gperftools-devel >= 2.6.1
+%endif
+%if 0%{?suse_version}
 BuildRequires: gperftools-devel >= 2.4
 %endif
+%endif
 BuildRequires:  jq
 BuildRequires: leveldb-devel > 1.2
 BuildRequires: libaio-devel