re-enable tmalloc on arm now gperftools is fixed

This commit is contained in:
Peter Robinson 2013-07-31 17:03:16 +01:00
parent 20d29cd716
commit 522d4bf6a9

View File

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