From ecb27103531ece0ee302957ff04cab8a17ec1ab3 Mon Sep 17 00:00:00 2001
From: Olivier Dion <olivier.dion@polymtl.ca>
Date: Mon, 1 May 2023 15:46:16 -0400
Subject: gnu: lttng-tools: Fix build failure.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/instrumentation.scm (lttng-tools)
[native-inputs]: Add autoconf, automake, libtool.
[arguments]: Add 'autoreconf build phase before 'configure.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/instrumentation.scm | 41 +++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm
index 114b100807..de74e6e03d 100644
--- a/gnu/packages/instrumentation.scm
+++ b/gnu/packages/instrumentation.scm
@@ -391,7 +391,10 @@ (define-public lttng-tools
          (add-after 'unpack 'patch-default-man-path
            (lambda _
              (substitute* "src/common/defaults.h"
-               (("/usr/bin/man") "man")))))))
+               (("/usr/bin/man") "man"))))
+         (add-before 'configure 'autoreconf
+           (lambda _
+             (invoke "autoreconf" "-vfi"))))))
     ;; NOTE - Users have to install python-3 in their profile to use the
     ;; bindings.  We don't put it in the inputs, because the rest of the tools
     ;; can work without it.
@@ -399,19 +402,31 @@ (define-public lttng-tools
      (list liburcu popt numactl))
     (propagated-inputs
      (list kmod module-init-tools))
+    ;; NOTE - LTTng 2.13.9 is distributed with a aclocal.m4 that does not
+    ;; support Python3.10.  We can either disable Python's bindings or we can
+    ;; reconfigure the project with our autoconf.  This is because the
+    ;; distribution tarballs are generated on Ubuntu LTS 18.04.
+    ;;
+    ;; `paredit-raise-sexp' on the first list of native inputs and remove the
+    ;; 'autoreconf build step whenever we bump to the next version that is
+    ;; goind to be generated on Ubuntu LTS 22.04.
     (native-inputs
-     (list pkg-config
-           perl
-           libpfm4
-           python-3
-           swig
-           procps
-           which
-           flex
-           bison
-           asciidoc
-           libxml2
-           lttng-ust))
+     (append
+      (list pkg-config
+            perl
+            libpfm4
+            python-3
+            swig
+            procps
+            which
+            flex
+            bison
+            asciidoc
+            libxml2
+            lttng-ust)
+      (list autoconf
+            automake
+            libtool)))
     (home-page "https://lttng.org/")
     (synopsis "LTTng userspace tracer libraries")
     (description "The lttng-tools project provides a session
-- 
cgit v1.2.3