From cd4b7ad6428523a968b38dc9aa1edaa35be96c62 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Fri, 18 Dec 2015 11:36:25 -0800 Subject: [PATCH] buildpackages: fix configure on Ubuntu 12.04. Ubuntu 12.04/precise has a buggy lttng; it fails our lttng-is-sane check, as it leaves out headers. This should not stop building of Ceph, as the automatic build handling from debian/rules will correctly omit LTTNG on Precise. Signed-off-by: Robin H. Johnson --- tasks/buildpackages/make-deb.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tasks/buildpackages/make-deb.sh b/tasks/buildpackages/make-deb.sh index 9517839b6bc..db9df06ffb5 100755 --- a/tasks/buildpackages/make-deb.sh +++ b/tasks/buildpackages/make-deb.sh @@ -69,10 +69,17 @@ function build_package() { # options (otherwise parts of the source tree will be left out). # ./autogen.sh + # Building with LTTNG on Ubuntu Precise is not possible. + # It fails the LTTNG-is-sane check (it misses headers) + # And the Debian rules files leave it out anyway + case $codename in + precise) lttng_opt="--without-lttng" ;; + *) lttng_opt="--with-lttng" ;; + esac ./configure $(flavor2configure $flavor) \ --with-rocksdb --with-ocf \ --with-nss --with-debug --enable-cephfs-java \ - --with-lttng --with-babeltrace + $lttng_opt --with-babeltrace # # use distdir= to set the name of the top level directory of the # tarbal to match the desired version