From patchwork Tue Feb 4 11:43:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 38198 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 1F6FF27BBEA; Tue, 4 Feb 2025 11:41:31 +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=-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=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 2711027BBE2 for ; Tue, 4 Feb 2025 11:41:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tfHIn-0008Vw-On; Tue, 04 Feb 2025 06:41:13 -0500 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 1tfHId-0008Ur-BQ for guix-patches@gnu.org; Tue, 04 Feb 2025 06:41:04 -0500 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 1tfHIc-0006A1-AZ; Tue, 04 Feb 2025 06:41:02 -0500 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=s5NenuoNCEI3y5ewgM5HeYBfcO7kZBgHJFoQPzD0vws=; b=AxoAWIViho9cvU9llxA12JVy9ldQlxtJ5dwLoJq5n78ceZiASOYMkM13xKmaBKoJmrDm/ysFUfm8U5LCEPK09hhdK18osdSkL9jSxdNZnx68m1Gsk+x6us8uFAYqdE0qnYPD/xdxpq9RuuV3rjvxIrbwZmys1hn1zcAnKOOEwfFJDulJOrJjOw/i5ckdHxwioHbx89N0zRR2bUh/xfCRdwugCTl1otzuMfJdQxa1K5NC2mlR35lN8HdwzZfJl5Z21n4w8mTsNAPCv3InGQbmhtTkmpDcp6RxIzPdbOUEIAjMK8wY9RlgLeGHswU9CLLqM9054mAPgxqwq8rB61/z5Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tfHIb-0002Tl-Sf; Tue, 04 Feb 2025 06:41:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76049] [PATCH] gnu: hurd: Add libpciaccess-static. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: janneke@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 04 Feb 2025 11:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76049 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76049@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= , Janneke Nieuwenhuizen X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Janneke Nieuwenhuizen Received: via spool by submit@debbugs.gnu.org id=B.17386692329480 (code B ref -1); Tue, 04 Feb 2025 11:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Feb 2025 11:40:32 +0000 Received: from localhost ([127.0.0.1]:42924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tfHI7-0002Sp-Jk for submit@debbugs.gnu.org; Tue, 04 Feb 2025 06:40:31 -0500 Received: from lists.gnu.org ([2001:470:142::17]:48110) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tfHI4-0002SZ-Qy for submit@debbugs.gnu.org; Tue, 04 Feb 2025 06:40:29 -0500 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 1tfHHv-0008LT-QF for guix-patches@gnu.org; Tue, 04 Feb 2025 06:40:21 -0500 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tfHHt-00066g-J6 for guix-patches@gnu.org; Tue, 04 Feb 2025 06:40:19 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id B3E8038A3E80; Tue, 4 Feb 2025 11:40:13 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id pCwLj71YTd5j; Tue, 4 Feb 2025 11:40:10 +0000 (UTC) Received: from localhost (unknown [112.44.101.157]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Tue, 4 Feb 2025 11:40:09 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 0116df80; Tue, 4 Feb 2025 11:43:50 +0000 (UTC) Date: Tue, 4 Feb 2025 19:43:40 +0800 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "vasilii.smirnov--- via Guix-patches\" via" 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: 宋文武 This is a followup to 20a8d796f1e8ed3f2ff3344fcf4ab40a45bc3942, which broke hurd. * gnu/packages/hurd.scm (libpciaccess-static): New variable. (hurd, netdde) [inputs]: Replace libpciaccess with libpciaccess-static. Change-Id: Ifb2cc3d210cf4ce6f4798eac1e9643f1c75ba6fa --- gnu/packages/hurd.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) base-commit: 4fa41a04802c43dc4c064b7ac4c2e6a4e92f63b6 diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 7a7f621e40..1045be31a3 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -311,6 +311,17 @@ (define %import-from-dde (define %add-to-hurd-subdirs (list "libmachdevdde" "libddekit")) +;;; A static libpciaccess is required by hurd and netdde. +(define libpciaccess-static + (package + (inherit libpciaccess) + (arguments + (substitute-keyword-arguments (package-arguments libpciaccess) + ((#:configure-flags flags) + #~(cons "-Ddefault_library=static" #$flags)))) + (propagated-inputs + (list zlib (list zlib "static"))))) + (define-public hurd (package (name "hurd") @@ -572,7 +583,7 @@ (define-public hurd `(("libgcrypt" ,libgcrypt) ;for /hurd/random ("libdaemon" ,libdaemon) ;for /bin/console --daemonize ("unifont" ,unifont) - ("libpciaccess" ,libpciaccess) + ("libpciaccess" ,libpciaccess-static) ;; For NFS support ("libtirpc" ,libtirpc/hurd) @@ -700,7 +711,7 @@ (define-public netdde (install-file "netdde" hurd) (install-file "netdde.static" hurd))))))) (inputs - (list hurd libpciaccess zlib `(,zlib "static"))) + (list hurd libpciaccess-static zlib `(,zlib "static"))) (native-inputs `(("coreutils" ,coreutils) ("gawk" ,gawk)