From patchwork Wed Nov 1 20:35: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: 18855 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 8BC7327BBE9; Wed, 1 Nov 2023 20:36:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 EBEF827BBE2 for ; Wed, 1 Nov 2023 20:36:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyHx1-0001kP-3e; Wed, 01 Nov 2023 16:36:31 -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 1qyHwy-0001kA-Tn for guix-patches@gnu.org; Wed, 01 Nov 2023 16:36:28 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyHwx-0007wr-MW for guix-patches@gnu.org; Wed, 01 Nov 2023 16:36:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qyHxV-0004Kr-Ux for guix-patches@gnu.org; Wed, 01 Nov 2023 16:37:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66888] [PATCH 2/2] gnu: Add babeltrace/dev. References: <20231101203022.28546-1-odion@efficios.com> In-Reply-To: <20231101203022.28546-1-odion@efficios.com> Resent-From: odion@efficios.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 20:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66888 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66888@debbugs.gnu.org Cc: Olivier Dion Received: via spool by 66888-submit@debbugs.gnu.org id=B66888.169887096616580 (code B ref 66888); Wed, 01 Nov 2023 20:37:01 +0000 Received: (at 66888) by debbugs.gnu.org; 1 Nov 2023 20:36:06 +0000 Received: from localhost ([127.0.0.1]:52696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyHwc-0004JM-2M for submit@debbugs.gnu.org; Wed, 01 Nov 2023 16:36:06 -0400 Received: from smtpout.efficios.com ([167.114.26.122]:39724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyHwa-0004Iq-BO for 66888@debbugs.gnu.org; Wed, 01 Nov 2023 16:36:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1698870924; bh=+dL8k1zuz3+hynQ6R/WFqa42nt8oNZ3OE8VdSjnU/QU=; h=From:To:Cc:Subject:Date:From; b=riY43PMFn2au4imh8qUJCx6wyF9oxY6AYUaav3MwXmKVq0u9cZSOcIlxjCNaUMhDa epBU+lPQbmn/87q378W8lAJXR9b7QdoWPkGG5Gxd3xTwXa+gyFwCZxZPdfwfzduZD3 Ylxp1fk1VXeh69QMYzUMDur84Aoa2C/je3rFt6QwcRQt4316L+vC4SYhI6vODhVqaX 6EkouvAu0LxoE6mL/Ch3BiUyOskcnDgucsEt8CJ9g0WbTb9imqlS8EPvmE4XKXPVOt h9kjr0TQJ5FVAuD3xAKg/U34E2unyLPi7SqD7Rl2XOYR3uovCkXtogK7O/J9OnB7II /WgzyFO7l36NA== Received: from localhost.localdomain (unknown [209.209.32.82]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4SLJfh3RKdz1b4f; Wed, 1 Nov 2023 16:35:24 -0400 (EDT) From: odion@efficios.com Date: Wed, 1 Nov 2023 16:35:16 -0400 Message-ID: <20231101203516.29726-1-odion@efficios.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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: , 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 From: Olivier Dion This dev variant of the package babeltrace is slower, but allows better developement of plugins as recommended by the authors. * gnu/packages/instrumentation.scm (babeltrace/dev): New variable. Change-Id: Ib54ced9a1ede5d9acc9a53ff325663a28a3b447f --- gnu/packages/instrumentation.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 0d6513aaca..4c92c81105 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -97,11 +97,9 @@ (define-public babeltrace (modify-phases %standard-phases ;; These are recommended in the project's README for a development ;; build configuration. - (add-before 'configure 'set-environment-variables + (add-after 'unpack 'reconfigure (lambda _ - (setenv "BABELTRACE_DEV_MODE" "1") - (setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE") - (invoke "autoreconf" "-vfi")))))) + (delete-file "configure")))))) (inputs (list glib)) ;; NOTE - elfutils is used for the LTTng debug information filter @@ -143,6 +141,18 @@ (define-public babeltrace bindings, and the command-line tool @command{babeltrace2}.") (license license:expat))) +(define-public babeltrace/dev + (package/inherit babeltrace + (name "babeltrace-dev") + (arguments + (substitute-keyword-arguments (package-arguments babeltrace) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'set-environment-variables + (lambda _ + (setenv "BABELTRACE_DEV_MODE" "1") + (setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE"))))))))) + (define-public barectf (package (name "barectf")