tags 652252 + patch thanks Hello,
attached you'll find a debdiff that fixes the FTBFS error. I picked the patch from the upstream 0.16 version and bumped the urcu dependency. Thanks, Gregor
diff -Nru ust-0.15/debian/changelog ust-0.15/debian/changelog --- ust-0.15/debian/changelog 2011-09-04 15:58:07.000000000 +0200 +++ ust-0.15/debian/changelog 2011-12-31 14:28:47.000000000 +0100 @@ -1,3 +1,10 @@ +ust (0.15-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Use caa_unlikely, depend on liburcu >= 0.6.6 (Closes: #652252) + + -- Gregor Jasny <gja...@googlemail.com> Sat, 31 Dec 2011 14:28:00 +0100 + ust (0.15-3) unstable; urgency=low * [61bf984] Remove liburcu1 from libust0 Depends (Closes: #637636) diff -Nru ust-0.15/debian/control ust-0.15/debian/control --- ust-0.15/debian/control 2011-09-04 15:58:07.000000000 +0200 +++ ust-0.15/debian/control 2011-12-31 14:27:08.000000000 +0100 @@ -1,7 +1,7 @@ Source: ust Priority: extra Maintainer: Jon Bernard <jbern...@debian.org> -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, liburcu-dev (>= 0.6.2), texinfo +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, liburcu-dev (>= 0.6.6), texinfo Standards-Version: 3.9.2 Section: libs Vcs-Git: git://git.debian.org/git/collab-maint/ust.git @@ -23,8 +23,7 @@ Package: libust-dev Section: libdevel Architecture: i386 amd64 powerpc ppc64 -Depends: ${misc:Depends}, libust0 (= ${binary:Version}) -Recommends: liburcu-dev +Depends: ${misc:Depends}, libust0 (= ${binary:Version}), liburcu-dev (>= 0.6.6) Description: LTTng Userspace Tracer (development) The userspace tracer is designed to provide detailed information about userspace activity. Like the kernel tracer, performance is the main goal. diff -Nru ust-0.15/debian/patches/0003-use_caa_unlikely.patch ust-0.15/debian/patches/0003-use_caa_unlikely.patch --- ust-0.15/debian/patches/0003-use_caa_unlikely.patch 1970-01-01 01:00:00.000000000 +0100 +++ ust-0.15/debian/patches/0003-use_caa_unlikely.patch 2011-12-31 14:23:44.000000000 +0100 @@ -0,0 +1,45 @@ +From: Mathieu Desnoyers <mathieu.desnoy...@efficios.com> +Date: Thu, 15 Dec 2011 22:10:50 +0000 (-0500) +Subject: Use caa_unlikely, depend on liburcu >= 0.6.6 +X-Git-Tag: v0.16~1 +X-Git-Url: http://git.lttng.org/?p=ust.git;a=commitdiff_plain;h=5296e06cffd5ed5dcf3bb9fe7e3a18744ac18823 + +Use caa_unlikely, depend on liburcu >= 0.6.6 + +Signed-off-by: Mathieu Desnoyers <mathieu.desnoy...@efficios.com> +--- + +diff --git a/README b/README +index a2d115b..8776ce4 100644 +--- a/README ++++ b/README +@@ -16,7 +16,7 @@ PREREQUISITES: + - liburcu + Userspace RCU library, by Mathieu Desnoyers and Paul E. McKenney + +- -> This release depends on liburcu v0.6 ++ -> This release depends on liburcu v0.6.6 + + * Debian/Ubuntu package: liburcu-dev + * Website: http://lttng.org/urcu +diff --git a/include/ust/tracepoint.h b/include/ust/tracepoint.h +index 5e7f9d8..ade5677 100644 +--- a/include/ust/tracepoint.h ++++ b/include/ust/tracepoint.h +@@ -27,6 +27,7 @@ + + #include <urcu-bp.h> + #include <urcu/list.h> ++#include <urcu/compiler.h> + + struct tracepoint_probe { + void *func; +@@ -96,7 +97,7 @@ struct tracepoint { + + #define __CHECK_TRACE(name, proto, args) \ + do { \ +- if (unlikely(__tracepoint_##name.state)) \ ++ if (caa_unlikely(__tracepoint_##name.state)) \ + __DO_TRACE(&__tracepoint_##name, \ + TP_PROTO(proto), TP_ARGS(args)); \ + } while (0) diff -Nru ust-0.15/debian/patches/series ust-0.15/debian/patches/series --- ust-0.15/debian/patches/series 2011-09-04 15:58:07.000000000 +0200 +++ ust-0.15/debian/patches/series 2011-12-31 14:32:10.000000000 +0100 @@ -1,2 +1,3 @@ 0001-Add-category-and-directory-entries-to-the-info-docum.patch 0002-Link-register-test-against-libpthread-for-binutils-g.patch +0003-use_caa_unlikely.patch