From: Jason Dillaman Date: Thu, 21 Jan 2016 20:36:37 +0000 (-0500) Subject: deb: strip tracepoint libraries from Wheezy/Precise builds X-Git-Tag: v0.94.6~30^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7316%2Fhead;p=ceph.git deb: strip tracepoint libraries from Wheezy/Precise builds These releases do not (by default) have a sane LTTng-UST environment, which results in autoconf disabling support for tracing. Signed-off-by: Jason Dillaman --- diff --git a/debian/control b/debian/control index 559843e9129f..535da30f9c0c 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Build-Depends: autoconf, default-jdk, git, gdisk, + grep, javahelper, junit4, libaio-dev, @@ -48,6 +49,7 @@ Build-Depends: autoconf, python-nose, python-virtualenv, sdparm | hdparm, + sed, uuid-dev, uuid-runtime, xfslibs-dev, diff --git a/debian/rules b/debian/rules index 1fd2d6660098..44ea7adeb671 100755 --- a/debian/rules +++ b/debian/rules @@ -40,6 +40,14 @@ configure-stamp: ./configure --prefix=/usr --localstatedir=/var \ --sysconfdir=/etc $(extraopts) $(confflags) \ $(CEPH_EXTRA_CONFIGURE_ARGS) + + # Wheezy and Precise do not support tracepoints + if ! grep -q 'define WITH_LTTNG' src/acconfig.h ; then \ + sed -i.orig '/lib.*_tp\.so/d' debian/ceph.install \ + debian/librados2.install \ + debian/librbd1.install ; \ + fi + touch $@ build-arch: build