GNU bug report logs - #76050
[PATCH] gnu: libxcb: Fix build for Hurd.

Previous Next

Package: guix-patches;

Reported by: iyzsong <at> envs.net

Date: Tue, 4 Feb 2025 12:42:02 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
Subject: bug#76050: closed (Re: [bug#76050] [PATCH] gnu: libxcb: Fix build
 for Hurd.)
Date: Tue, 04 Feb 2025 13:40:02 +0000
[Message part 1 (text/plain, inline)]
Your bug report

#76050: [PATCH] gnu: libxcb: Fix build for Hurd.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 76050 <at> debbugs.gnu.org.

-- 
76050: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=76050
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: 宋文武 <iyzsong <at> envs.net>
To: Janneke Nieuwenhuizen <janneke <at> gnu.org>
Cc: 宋文武 <iyzsong <at> member.fsf.org>,
 76050-done <at> debbugs.gnu.org
Subject: Re: [bug#76050] [PATCH] gnu: libxcb: Fix build for Hurd.
Date: Tue, 04 Feb 2025 21:43:13 +0800
> Otherwise LGTM!
>
> Greetings,
> Janneke

Pushed to master, thank you for the review!

[Message part 3 (message/rfc822, inline)]
From: iyzsong <at> envs.net
To: guix-patches <at> gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: [PATCH] gnu: libxcb: Fix build for Hurd.
Date: Tue,  4 Feb 2025 20:45:07 +0800
From: 宋文武 <iyzsong <at> member.fsf.org>

* gnu/packages/xorg.scm (libxcb) [propagated-inputs]: Add libpthread-stubs
when targeting hurd.
[arguments]: Add fix-PATH_MAX phase when targeting hurd.

Authored-by: yelninei on IRC.
Change-Id: Id673045c0c1a94a2d63bac7ea10a49174131d0ed
---
 gnu/packages/xorg.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 22e576395a..5cdc3a215e 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5045,7 +5045,10 @@ (define-public libxcb
     (build-system gnu-build-system)
     (outputs '("out" "doc"))                      ;5.5 MiB of man pages
     (propagated-inputs
-      (list libxau libxdmcp))
+      (append (list libxau libxdmcp)
+              (if (target-hurd?)
+                  (list libpthread-stubs)         ;still checked on Hurd
+                  '())))
     (inputs
       (list xcb-proto
             check))                               ;for tests
@@ -5056,7 +5059,15 @@ (define-public libxcb
                                "--disable-static"
                                (string-append "--mandir="
                                               (assoc-ref %outputs "doc")
-                                              "/share/man"))))
+                                              "/share/man"))
+       #:phases ,(if (target-hurd?)
+                     '(modify-phases %standard-phases
+                        (add-after 'unpack 'fix-PATH_MAX
+                          (lambda _
+                            ;; Hurd doesn't define PATH_MAX.
+                            (substitute* "src/xcb_util.c"
+                              (("PATH_MAX") "4096")))))
+                     '%standard-phases)))
     (home-page "https://xcb.freedesktop.org/")
     (synopsis "The X C Binding (XCB) library")
     (description

base-commit: 4fa41a04802c43dc4c064b7ac4c2e6a4e92f63b6
prerequisite-patch-id: c6037eae461ad0d2c2229c9dd69de59b8a86827a
-- 
2.48.1




This bug report was last modified 105 days ago.

Previous Next


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