GNU bug report logs - #76049
[PATCH] gnu: hurd: Add libpciaccess-static.

Previous Next

Package: guix-patches;

Reported by: iyzsong <at> envs.net

Date: Tue, 4 Feb 2025 11:41:01 UTC

Severity: normal

Tags: patch

Done: 宋文武 <iyzsong <at> envs.net>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: 宋文武 <iyzsong <at> envs.net>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#76049: closed ([PATCH] gnu: hurd: Add libpciaccess-static.)
Date: Tue, 04 Feb 2025 13:41:02 +0000
[Message part 1 (text/plain, inline)]
Your message dated Tue, 04 Feb 2025 21:43:42 +0800
with message-id <8734gtq0z5.fsf <at> envs.net>
and subject line Re: [bug#76049] [PATCH] gnu: hurd: Add libpciaccess-static.
has caused the debbugs.gnu.org bug report #76049,
regarding [PATCH] gnu: hurd: Add libpciaccess-static.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
76049: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=76049
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: iyzsong <at> envs.net
To: guix-patches <at> gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: [PATCH] gnu: hurd: Add libpciaccess-static.
Date: Tue,  4 Feb 2025 19:43:40 +0800
From: 宋文武 <iyzsong <at> member.fsf.org>

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(-)

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)

base-commit: 4fa41a04802c43dc4c064b7ac4c2e6a4e92f63b6
-- 
2.48.1



[Message part 3 (message/rfc822, inline)]
From: 宋文武 <iyzsong <at> envs.net>
To: 76049-done <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>,
 Janneke Nieuwenhuizen <janneke <at> gnu.org>
Subject: Re: [bug#76049] [PATCH] gnu: hurd: Add libpciaccess-static.
Date: Tue, 04 Feb 2025 21:43:42 +0800
Pushed to master, thanks.


This bug report was last modified 108 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.