From patchwork Mon May 1 19:46:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Dion X-Patchwork-Id: 49730 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 119B427BBE9; Mon, 1 May 2023 20:47:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A969A27BBE2 for ; Mon, 1 May 2023 20:47:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ptZUH-0006q1-QL; Mon, 01 May 2023 15:47:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptZUE-0006pW-RF for guix-patches@gnu.org; Mon, 01 May 2023 15:47:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptZUE-0005uA-J1 for guix-patches@gnu.org; Mon, 01 May 2023 15:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ptZUE-0004Fv-EN for guix-patches@gnu.org; Mon, 01 May 2023 15:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63213] [PATCH] gnu: lttng-tools: Fix build failure. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 May 2023 19:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63213 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63213@debbugs.gnu.org Cc: Olivier Dion X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168297040016325 (code B ref -1); Mon, 01 May 2023 19:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 May 2023 19:46:40 +0000 Received: from localhost ([127.0.0.1]:41106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptZTr-0004FB-TL for submit@debbugs.gnu.org; Mon, 01 May 2023 15:46:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:51620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptZTo-0004F2-TK for submit@debbugs.gnu.org; Mon, 01 May 2023 15:46:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptZTg-0006mo-Qm for guix-patches@gnu.org; Mon, 01 May 2023 15:46:28 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptZTe-0005lt-Rj for guix-patches@gnu.org; Mon, 01 May 2023 15:46:28 -0400 Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 341JkHZS023475 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 1 May 2023 15:46:25 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 341JkHZS023475 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1682970385; bh=uZijy+LUmpojX4ZyhKEoKTjAfzOBRUaY1jVTmIOkzic=; h=From:To:Cc:Subject:Date:From; b=OcsUYab0cSmK5Rlff5HrZpYQOLQPH4Ikue0vpU87Ps76hqj9bEe6s/axUv5TyUWv0 Ch2vvJrHsOJGckLC4rBocJ4D/Y4vG+jWwne4NItrZH2l7lLfVHnUpObFe4bwwI4NEs a7cxL619XS+oIvf/wUPVzjmlgSe28McISh8LYNb0= Date: Mon, 1 May 2023 15:46:16 -0400 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Mon, 1 May 2023 19:46:17 +0000 Received-SPF: pass client-ip=132.207.4.11; envelope-from=olivier.dion@polymtl.ca; helo=smtp.polymtl.ca X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Olivier Dion X-ACL-Warn: , Olivier Dion via Guix-patches X-Patchwork-Original-From: Olivier Dion via Guix-patches via From: Olivier Dion Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/instrumentation.scm (lttng-tools) [native-inputs]: Add autoconf, automake, libtool. [arguments]: Add 'autoreconf build phase before 'configure. --- gnu/packages/instrumentation.scm | 42 ++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 13 deletions(-) base-commit: f21007ce4aceeacf5bbfc7cd45d526073141f194 diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index c25086127a..cbfb49370e 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -17,6 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages instrumentation) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) @@ -376,7 +377,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. @@ -384,19 +388,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