From patchwork Tue May 2 00:56:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Dion X-Patchwork-Id: 49738 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 2E86527BBE2; Tue, 2 May 2023 01:57:25 +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 3DE8D27BBE9 for ; Tue, 2 May 2023 01:57:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pteKH-0000n5-B2; Mon, 01 May 2023 20:57: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 1pteKF-0000ms-Mj for guix-patches@gnu.org; Mon, 01 May 2023 20:57:03 -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 1pteKF-0001w3-59 for guix-patches@gnu.org; Mon, 01 May 2023 20:57:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pteKE-00051E-FP for guix-patches@gnu.org; Mon, 01 May 2023 20:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63218] [PATCH] gnu: babeltrace: Fix build failure. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 May 2023 00:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63218 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63218@debbugs.gnu.org Cc: Olivier Dion X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168298900619266 (code B ref -1); Tue, 02 May 2023 00:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 May 2023 00:56:46 +0000 Received: from localhost ([127.0.0.1]:41278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pteJx-00050g-UJ for submit@debbugs.gnu.org; Mon, 01 May 2023 20:56:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:55710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pteJr-00050S-Mg for submit@debbugs.gnu.org; Mon, 01 May 2023 20:56:44 -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 1pteJr-0000kZ-9n for guix-patches@gnu.org; Mon, 01 May 2023 20:56:39 -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 1pteJm-0001sQ-7w for guix-patches@gnu.org; Mon, 01 May 2023 20:56:39 -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 3420uJPx028071 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 1 May 2023 20:56:26 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 3420uJPx028071 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1682988987; bh=RtJQzjbtCYb7UTb0VtrGwa+l/fv77YZ5/QiMuHCk1Mk=; h=From:To:Cc:Subject:Date:From; b=qaRnTvHawPj9iwGYoT/LYut/Gi7wGSA1qcyVJSA2QwkrP6coizuKD+BddRPZwHDS/ k+cjGQV77BDR5KkvDE5SmOmlNbIF55ORy+27l9T2zlzHaSv+w8yMaJjiCVLMhi+qnJ BkVs8Ttqdcy5w5sRRlRMKEDQll1EejC3C38YUXf0= Date: Mon, 1 May 2023 20:56:18 -0400 Message-Id: <3d84fb99205dc84d30ac9d17e06ad0c6a5ad5fb5.1682988972.git.olivier.dion@polymtl.ca> 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 Tue, 2 May 2023 00:56:19 +0000 Received-SPF: pass client-ip=132.207.4.11; envelope-from=olivier.dion@polymtl.ca; helo=smtp.polymtl.ca X-Spam_score_int: -39 X-Spam_score: -4.0 X-Spam_bar: ---- X-Spam_report: (-4.0 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=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 (babeltrace) [native-inputs]: Add autoconf, automake, libtool. [arguments]: Invoke autoreconf before 'configure. --- gnu/packages/instrumentation.scm | 33 +++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) base-commit: 39ba8a10971f15264966823e8696d63c2995df86 diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index c25086127a..114b100807 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) @@ -93,7 +94,8 @@ (define-public babeltrace (add-before 'configure 'set-environment-variables (lambda _ (setenv "BABELTRACE_DEV_MODE" "1") - (setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE")))))) + (setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE") + (invoke "autoreconf" "-vfi")))))) (inputs (list glib)) ;; NOTE - elfutils is used for the LTTng debug information filter @@ -104,15 +106,28 @@ (define-public babeltrace (list elfutils)) ;; NOTE - python-3 is set here for generating the bindings. Users need to ;; install python-3 in their profile in order to use these bindings. + ;; + ;; NOTE - Babeltrace 2.0.4 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 invokation whenever we bump to the next version that is + ;; goind to be generated on Ubuntu LTS 22.04. (native-inputs - (list asciidoc - bison - flex - pkg-config - python-3 - python-sphinx - swig - xmltoman)) + (append + (list asciidoc + bison + flex + pkg-config + python-3 + python-sphinx + swig + xmltoman) + (list autoconf + automake + libtool))) (home-page "https://babeltrace.org/") (synopsis "Trace manipulation toolkit") (description "Babeltrace 2 is a framework for viewing, converting,