From patchwork Thu Oct 24 19:43:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashish SHUKLA X-Patchwork-Id: 69420 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 0FE5327BBE9; Thu, 24 Oct 2024 20:45:03 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 89AE527BBE2 for ; Thu, 24 Oct 2024 20:45:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t43l6-0007jF-Jc; Thu, 24 Oct 2024 15:44:36 -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 1t43l4-0007ba-Hs for guix-patches@gnu.org; Thu, 24 Oct 2024 15:44:34 -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 1t43l4-00088h-9C for guix-patches@gnu.org; Thu, 24 Oct 2024 15:44:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=+BWBuQAEvpPhqlfRL5RCoeA4z0eozfhwtxvFxo6SyNc=; b=FErHl5QrZK6/U7PkTc05R8k18cMuwiHBpxYTpjz0uV+I3JrJCdmrLqkRmnQitCVH0GH8HtTZvKG7r3Ya4x4YoNJfIdqwGE1CAlH2d8QlOd1Xb/Xu8ZvsPUNypzT4zr3XUhgFEyf9nPg5GE2njz2xJPnkQrcuadbCuTrV8xnCVIZ/BdM8D7OSXD6BT85wEyKJTWJ4sjJoit1RNe5eoKHnRfG7jSGALKsspwHed9V6RjLbd932MkzszcPpO9hGSwPTaC0IAUPcGa6wzDH/KEO0+QZobwfWSEmRndP71Gz1xa/HYZ8g9eoYbBCBjdVy++NhmQOpz53uVSHIjbtO9utCtg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t43lW-0004wO-OX; Thu, 24 Oct 2024 15:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73994] [PATCH] gnu: bpftrace: Update to 1.21.2. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Thu, 24 Oct 2024 19:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73994 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73994@debbugs.gnu.org Cc: Ashish SHUKLA , Leo Famulari , Wilko Meyer X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Leo Famulari , Wilko Meyer Received: via spool by submit@debbugs.gnu.org id=B.172979905918917 (code B ref -1); Thu, 24 Oct 2024 19:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Oct 2024 19:44:19 +0000 Received: from localhost ([127.0.0.1]:36236 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t43kp-0004v3-5J for submit@debbugs.gnu.org; Thu, 24 Oct 2024 15:44:19 -0400 Received: from lists.gnu.org ([209.51.188.17]:41208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t43kl-0004us-8g for submit@debbugs.gnu.org; Thu, 24 Oct 2024 15:44:17 -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 1t43kA-0006Om-QY for guix-patches@gnu.org; Thu, 24 Oct 2024 15:43:39 -0400 Received: from anamika.lostca.se ([65.21.75.227]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t43k8-00082v-Fn for guix-patches@gnu.org; Thu, 24 Oct 2024 15:43:38 -0400 Received: from localhost.localdomain (unknown [IPv6:2a02:9140:3880:a200:5ec:a5a8:cf14:36a9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 196FF35650; Thu, 24 Oct 2024 19:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1729799002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=+BWBuQAEvpPhqlfRL5RCoeA4z0eozfhwtxvFxo6SyNc=; b=N5htx8uZNU0DVZl3RbxtPG+MPPtRyA0Kb32U3zYXJp94C67vKhJQJVldUlK81v7xrNVqfP lgIeULvEyLfc4jWxQ4k4iooYFQIHhYxsd2XvMroIYQydWERxM1KA/kwy5xLOUvmHizNYap 1aWirLkjTIEVjdg4oel6anABbY+WFOQ= Date: Thu, 24 Oct 2024 21:43:12 +0200 Message-ID: <3223c821d377cf78c51d25858cd5c91373ebebad.1729798992.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 Received-SPF: pass client-ip=65.21.75.227; envelope-from=ashish.is@lostca.se; helo=anamika.lostca.se X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: Ashish SHUKLA X-ACL-Warn: , Ashish SHUKLA via Guix-patches X-Patchwork-Original-From: Ashish SHUKLA via Guix-patches via From: Ashish SHUKLA 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 This patch also fixes broken compilation due to improper detection of bfd features. This is taken from following upstream PR: https://github.com/bpftrace/bpftrace/pull/3332 * gnu/packages/linux.scm (bpftrace): Update to 1.21.2. [arguments] Rename, and update "patch-paths" phase. Change-Id: If7180d4da8073914172296f46a3427ccdff22478 --- gnu/packages/linux.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) base-commit: 2394a7f5fbf60dd6adc0a870366adb57166b6d8b diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e0785cccf7..6578dd2e97 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -10343,7 +10343,7 @@ (define-public bpftool (define-public bpftrace (package (name "bpftrace") - (version "0.21.0") + (version "0.21.2") (source (origin (method git-fetch) @@ -10352,7 +10352,7 @@ (define-public bpftrace (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "06yg3w80kdq0i003w2gvn0czbh8z9d3rfgmglp37dkir7g3dc6iz")))) + (base32 "0icbhf1wk523a7lcmwqa67zc6hl6h02p5mfg26cizva447kbwsgz")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DBUILD_TESTING=ON") ;; Only run the unit tests suite, as the other ones @@ -10360,8 +10360,14 @@ (define-public bpftrace ;; 'root'. #:test-target "bpftrace_test" #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-paths + (add-after 'unpack 'patch-paths-and-bfd-defs (lambda _ + (substitute* '("cmake/FindLibBfd.cmake" + "src/CMakeLists.txt") + (("LIBSFRAME_FOUND") + "LIBSFRAME_LIBRARIES") + (("LIBZSTD_FOUND") + "LIBZSTD_LIBRARIES")) (with-directory-excursion "tests" (substitute* (find-files ".") (("/bin/sh")