RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-28 14:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tcmalloc handling in spec file

Browse Source 
- there is no gperftools/tcmalloc on s390(x) yet
- explicitly disable tcmalloc when built without

Signed-off-by: Dan Horák <dan@danny.cz>
This commit is contained in:
Dan Horák 2016-05-06 13:29:03 +02:00 committed by Boris Ranto
parent 4c58365ca3
commit efa7f7b365
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ceph.spec.in
View File

@ -18,7 +18,12 @@
%bcond_without cephfs_java
%bcond_with tests
%bcond_with xio
%ifnarch s390 s390x
%bcond_without tcmalloc
%else
# no gperftools/tcmalloc on s390(x)
%bcond_with tcmalloc
%endif
%bcond_without libs_compat
%bcond_with lowmem_builder
%if 0%{?fedora} || 0%{?rhel}
@ -138,7 +143,9 @@ BuildRequires: btrfs-progs
BuildRequires: nss-devel
BuildRequires: keyutils-libs-devel
BuildRequires: libatomic_ops-devel
%if 0%{with tcmalloc}
BuildRequires: gperftools-devel
%endif
BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: redhat-lsb-core
@ -661,7 +668,9 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
%endif
$CEPH_EXTRA_CONFIGURE_ARGS \
%{?_with_ocf} \
%{?_with_tcmalloc} \
%if %{without tcmalloc}
--without-tcmalloc \
%endif
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
%if %{with lowmem_builder}