diff --git a/ceph.spec b/ceph.spec index 3185df3..8671d84 100644 --- a/ceph.spec +++ b/ceph.spec @@ -107,9 +107,15 @@ EXTRA_LDFLAGS="-lpthread" %if ( 0%{?rhel} && 0%{?rhel} <= 6 ) --without-libxfs \ %endif +%if ( ! (0%{?rhel} && 0%{?rhel} <= 6 ) ) %ifarch ppc s390 s390x --without-tcmalloc \ %endif +%else +%ifarch ppc ppc64 s390 s390x +--without-tcmalloc \ +%endif +%endif --with-system-leveldb --without-hadoop --with-radosgw --with-gtk2 \ CFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS" \ CXXFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS -fvisibility-inlines-hidden" \ @@ -302,6 +308,9 @@ fi %changelog * Thu Jun 5 2014 Kaleb S. KEITHLEY +- el6 ppc64 likewise for tcmalloc, merge from origin/el6 + +* Thu Jun 5 2014 Kaleb S. KEITHLEY - el6 ppc64 does not have gperftools, merge from origin/el6 * Thu Jun 5 2014 Kaleb S. KEITHLEY - 0.81.0-1