From patchwork Wed May 15 16:57:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 64461 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 6695527BBEA; Wed, 15 May 2024 18:00:37 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 9E2BB27BBE2 for ; Wed, 15 May 2024 18:00:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s7Hz9-0001qN-Uo; Wed, 15 May 2024 13:00:12 -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 1s7Hz1-0001nJ-VY for guix-patches@gnu.org; Wed, 15 May 2024 13:00:05 -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 1s7Hz1-0007Ff-DT for guix-patches@gnu.org; Wed, 15 May 2024 13:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s7Hz2-0007Bc-65; Wed, 15 May 2024 13:00:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70962] [PATCH 05/14] gnu: libbpf: Update to 1.4.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, w@wmeyer.eu, guix-patches@gnu.org Resent-Date: Wed, 15 May 2024 17:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70962 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70962@debbugs.gnu.org Cc: Maxim Cournoyer , Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice , Wilko Meyer Received: via spool by 70962-submit@debbugs.gnu.org id=B70962.171579236127442 (code B ref 70962); Wed, 15 May 2024 17:00:04 +0000 Received: (at 70962) by debbugs.gnu.org; 15 May 2024 16:59:21 +0000 Received: from localhost ([127.0.0.1]:43154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7HyL-00078X-78 for submit@debbugs.gnu.org; Wed, 15 May 2024 12:59:21 -0400 Received: from mail-qk1-f173.google.com ([209.85.222.173]:50281) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7HyI-000780-LZ for 70962@debbugs.gnu.org; Wed, 15 May 2024 12:59:19 -0400 Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-792e4c2a002so222636085a.0 for <70962@debbugs.gnu.org>; Wed, 15 May 2024 09:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715792291; x=1716397091; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=41nUPnhWRpPavxW3XWvfiiBxPhIIUGIx50DZmI1Ws5U=; b=GUdWCxCiJkYJjvt2c44LxDOPpg2ChiMA59v1ZvtsNU2p2tRGdwmlJHwBlZzv6VcyUJ UbpxpElPNVb0MgpVgyiEl1dvSWoPoIkUCBaZXJEGTCc5zfcdKLSjO/WtwOZcitVnzdsE S6ssUI6z295vuEC1keXybrMihtkbHGndGtU76LTwAjUwM3i3olwz1vsfdDXk12aa5PbR PZy52V3uiK6tzva+B2duObNpsgpeSW4zjFfUN8Sb5GE1zi/SMVggkI5/ek4kM3I+eRW9 Gtf7PwpeKZ0+fjDBt+qt9tCFhFVefaGjKL3rHV1N91cEJ71BAPSIOdZYqkMe+bThE89m sTVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715792291; x=1716397091; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=41nUPnhWRpPavxW3XWvfiiBxPhIIUGIx50DZmI1Ws5U=; b=jhfuhJlVHFNLlidxhI9EGwz2u+AISzxqEJZukKR4NXQayEY9RAEu3LJa0wI3bkj91A vfncNGP7n4tUABZ8thLHfIWSlKKXVdtPijb4FIyWNeqYWwNgMmsZtgLj7GeTT0NgCWBh JvOX2o+jm5ZFq+5Ut3tOgo/c0piWsPh8fSVxftYGMveqbssx12RSZP6OSNZIzS/wV2gN L1ZoG94I/UGF8D+SDyRejb2Mp56DyicguQkY6CdTOcbIbr0QbY1vM14/8jSUBhYqtEv3 7QPsAwxsLGE8Ib/0ld05661lcnVSUbitnzeadfm7gn/aNh63ma6Xt0LLBthp6kPpXZCM bGew== X-Gm-Message-State: AOJu0YxW+Va8pkkECv1whWVnyntv7OC2Nn7nNG2s9gUS7KuP4vrsGGt3 iGzsRmsZhtNmPrsf1iuNsmIR85sgLFPAJ3mu3H8cyjI6EIA/PFDZFoSRkw== X-Google-Smtp-Source: AGHT+IHZJXa+SFi8CQFB5MXaYDGaHSmibK3ag/lWUaUh8dNYHKoVM6myyvnUCHf1CBVDMg011gwWgA== X-Received: by 2002:a05:6214:2d42:b0:6a3:2a94:1813 with SMTP id 6a1803df08f44-6a32a941825mr138369926d6.50.1715792290794; Wed, 15 May 2024 09:58:10 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-125-107.b2b2c.ca. [205.233.125.107]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6a15f194871sm66068896d6.59.2024.05.15.09.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 May 2024 09:58:10 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 15 May 2024 12:57:15 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <7cf609dcf83c85b6897c9fb9af46ce8a854a15c8.1715791830.git.maxim.cournoyer@gmail.com> References: <7cf609dcf83c85b6897c9fb9af46ce8a854a15c8.1715791830.git.maxim.cournoyer@gmail.com> 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 * gnu/packages/linux.scm (libbpf): Update to 1.4.1. [phases] {install-linux-bpf-headers}: New phase. [native-inputs]: Add linux-libre-headers-6.8. Change-Id: I969a017b0ed52c1a611b3fe0d90d5b8703d35e73 --- gnu/packages/linux.scm | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index dea203a692..cb348276e3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9783,7 +9783,7 @@ (define-public cachefilesd (define-public libbpf (package (name "libbpf") - (version "0.8.1") + (version "1.4.1") (source (origin (method git-fetch) @@ -9793,7 +9793,7 @@ (define-public libbpf (file-name (git-file-name name version)) (sha256 (base32 - "1zzpkk4x3f20483dzw43b3ml03d63vvkmqf4j8y3b61b67wm59bm")))) + "1d0bx4bmn80nkdh0dqjfwq6j37is3qwl49cjvx4yxb4vrxq3x05x")))) (build-system gnu-build-system) (arguments (list @@ -9802,12 +9802,37 @@ (define-public libbpf #~(list (string-append "PREFIX=" #$output) (string-append "LIBDIR=$(PREFIX)/lib") (string-append "CC=" #$(cc-for-target))) - #:phases #~(modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'pre-build - (lambda _ - (chdir "src")))))) - (native-inputs (list pkg-config)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'pre-build + (lambda _ + (chdir "src"))) + (add-after 'install 'install-linux-bpf-headers + ;; Workaround users such as 'dwarves' requiring btf_enum64 + ;; definition from the kernel Linux >= 6 headers (see: + ;; https://github.com/acmel/dwarves/issues/49). + ;; TODO: Remove once our 'linux-libre-headers' package is + ;; upgraded to a >= 6 release. + (lambda _ + (let ((linux-libre-headers #$(this-package-native-input + "linux-libre-headers"))) + (for-each (lambda (f) + (install-file (string-append linux-libre-headers + "/include/" f) + (string-append #$output "/include/" + (dirname f)))) + ;; This list contains btf.h and its transitive + ;; dependencies. + (list "asm/posix_types.h" + "asm/types.h" + "asm-generic/types.h" + "asm-generic/int-ll64.h" + "linux/btf.h" + "linux/posix_types.h" + "linux/stddef.h" + "linux/types.h")))))))) + (native-inputs (list linux-libre-headers-6.8 pkg-config)) (propagated-inputs (list elfutils zlib)) ;in Requires.private of libbpf.pc (home-page "https://github.com/libbpf/libbpf") (synopsis "BPF CO-RE (Compile Once – Run Everywhere)")