]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
buildpackages: fix configure on Ubuntu 12.04.
authorRobin H. Johnson <robin.johnson@dreamhost.com>
Fri, 18 Dec 2015 19:36:25 +0000 (11:36 -0800)
committerLoic Dachary <ldachary@redhat.com>
Sat, 9 Apr 2016 00:05:20 +0000 (02:05 +0200)
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 <robin.johnson@dreamhost.com>
(cherry picked from commit cd4b7ad6428523a968b38dc9aa1edaa35be96c62)

tasks/buildpackages/make-deb.sh

index 9517839b6bc1cce607d3ae7b0921558888668d1c..db9df06ffb5259e41e35bd0b555531a9aaca3fea 100755 (executable)
@@ -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