[gearmand/el6/master] Only build with tcmalloc on selected archs (i386/ppc on el5, and i686 only on el6) based on google
derks
derks at fedoraproject.org
Thu Feb 24 23:02:25 UTC 2011
commit edee2cffe6a095c648c92800ebe918f6e0dca9e8
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date: Thu Feb 24 17:02:28 2011 -0600
Only build with tcmalloc on selected archs (i386/ppc on el5,
and i686 only on el6) based on google-perftools availability
in the Koji build repos.
gearmand.spec | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/gearmand.spec b/gearmand.spec
index 8e6dabb..32d9283 100644
--- a/gearmand.spec
+++ b/gearmand.spec
@@ -2,16 +2,28 @@
# libmemcached is currently too old in RHEL
%bcond_with libmemcached
+# google-perftools is only available for i386/ppc on el5
+# and i686 on el6.
# google-perftools not available in ppc64/sparc64
-%ifnarch ppc64 sparc64
-%bcond_without tcmalloc
+%if 0%{?el5}
+%ifarch i386 ppc
+%bcond_without google_perftools
%else
-%bcond_with tcmalloc
+%bcond_with google_perftools
+%endif
+%endif
+
+%if 0%{?el6}
+%ifarch i386 i686
+%bcond_without google_perftools
+%else
+%bcond_with google_perftools
+%endif
%endif
Name: gearmand
Version: 0.14
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A distributed job system
Group: System Environment/Daemons
@@ -34,8 +46,9 @@ BuildRequires: libuuid-devel
BuildRequires: libmemcached-devel
%endif
-%if %{with tcmalloc}
-BuildRequires: google-perftools-devel
+%if %{with google_perftools}
+BuildRequires: google-perftools-devel
+Requires: google-perftools
%endif
Requires(pre): shadow-utils
@@ -76,7 +89,7 @@ Development libraries for %{name}
%build
# optional configure options
-%if %{with tcmalloc}
+%if %{with google_perftools}
%global configure_tcmalloc --enable-tcmalloc
%else
%global configure_tcmalloc --disable-tcmalloc
@@ -162,6 +175,11 @@ fi
%{_libdir}/libgearman*.so.*
%changelog
+* Thu Feb 24 2011 BJ Dierkes <wdierkes at rackspace.com> - 0.14-3
+- Only build with tcmalloc on selected archs (i386/ppc on el5,
+ and i686 only on el6) based on google-perftools availability
+ in the Koji build repos.
+
* Fri Feb 04 2011 BJ Dierkes <wdierkes at rackspace.com> - 0.14-2
- Adding support for EPEL 5/6
- Added optional support for libmemcached
More information about the scm-commits
mailing list