[Pkg-ceph-commits] [ceph] 01/01: Enabled gperftools for armhf and powerpc

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch master
in repository ceph.

commit 46feced65d223b5f431fe8f062503279bb024ba0
Author: James Page <james.page at ubuntu.com>
Date:   Fri Nov 22 21:28:48 2013 +0000

    Enabled gperftools for armhf and powerpc
    
    google-perftools is now built for armhf and powerpc; enable
    use by ceph for these architectures.
---
 debian/changelog |  3 ++-
 debian/control   |  2 +-
 debian/rules     | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 31c1817..27c4eb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 ceph (0.72.1-1ubuntu1) UNRELEASED; urgency=low
 
   * Fix upgrade failures from ceph < 0.67.3-1 (Closes: #728164):
-    - d/control: ceph-mds Breaks/Replaces ceph (<< 0.67.3-1). 
+    - d/control: ceph-mds Breaks/Replaces ceph (<< 0.67.3-1).
+  * d/rules,control: Use google-perftools on armhf and powerpc archs.
 
  -- James Page <james.page at ubuntu.com>  Fri, 22 Nov 2013 20:02:20 +0000
 
diff --git a/debian/control b/debian/control
index f3b9615..f25d9d6 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 9~),
                libexpat1-dev,
                libfcgi-dev,
                libfuse-dev,
-               libgoogle-perftools-dev [i386 amd64],
+               libgoogle-perftools-dev [i386 amd64 powerpc armhf],
                libkeyutils-dev,
                libleveldb-dev,
                libnss3-dev,
diff --git a/debian/rules b/debian/rules
index 81d9371..e25f036 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,13 +21,13 @@ ifeq ($(DEB_HOST_ARCH), armel)
   extraopts += --without-libatomic-ops
 endif
 
-# TODO powerpc support?
-ifneq ($(DEB_HOST_ARCH), i386)
-ifneq ($(DEB_HOST_ARCH), amd64)
-  # libgoogle-perftools-dev is only available on i386 and amd64
+# Only selected architectures support gperftools
+gperftools_archs = i386 amd64 powerpc armhf
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gperftools_archs)))
+  extraopts += --with-tcmalloc
+else
   extraopts += --without-tcmalloc
 endif
-endif
 
 # Use system provided libs3
 extraopts += --with-system-libs3

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git