From 522d4bf6a9739a1ffe2e2df459fb04be9b306750 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Jul 31 2013 17:29:23 +0000 Subject: re-enable tmalloc on arm now gperftools is fixed --- diff --git a/ceph.spec b/ceph.spec index 081bfbc..39614a2 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1,6 +1,6 @@ Name: ceph Version: 0.61.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: User space components of the Ceph file system License: LGPLv2 Group: System Environment/Base @@ -14,7 +14,7 @@ Patch2: ceph-fix-sbin-target.patch BuildRequires: fuse-devel, libtool, libtool-ltdl-devel, boost-devel, BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm, libaio-devel, # google-perftools is not available on these: -%ifnarch ppc ppc64 s390 s390x armv7hl +%ifnarch ppc ppc64 s390 s390x BuildRequires: gperftools-devel %endif BuildRequires: cryptopp-devel, libatomic_ops-static, gcc-c++ @@ -92,7 +92,7 @@ EXTRA_LDFLAGS="-lpthread" %{configure} --prefix=%{_prefix} --sbindir=%{_sbindir} \ --localstatedir=%{_localstatedir} --sysconfdir=%{_sysconfdir} \ -%ifarch ppc ppc64 s390 s390x armv7hl +%ifarch ppc ppc64 s390 s390x --without-tcmalloc \ %endif --with-system-leveldb --without-hadoop --with-radosgw --with-gtk2 \ @@ -264,6 +264,9 @@ fi %{_sysconfdir}/bash_completion.d/radosgw-admin %changelog +* Wed Jul 31 2013 Peter Robinson 0.61.7-2 +- re-enable tmalloc on arm now gperftools is fixed + * Mon Jul 29 2013 Josef Bacik - 0.61.7-1 - Update to 0.61.7