unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#76050] [PATCH] gnu: libxcb: Fix build for Hurd.
@ 2025-02-04 12:45 iyzsong--- via Guix-patches via
  2025-02-04 12:49 ` Janneke Nieuwenhuizen
  0 siblings, 1 reply; 3+ messages in thread
From: iyzsong--- via Guix-patches via @ 2025-02-04 12:45 UTC (permalink / raw)
  To: 76050; +Cc: 宋文武

From: 宋文武 <iyzsong@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





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#76050] [PATCH] gnu: libxcb: Fix build for Hurd.
  2025-02-04 12:45 [bug#76050] [PATCH] gnu: libxcb: Fix build for Hurd iyzsong--- via Guix-patches via
@ 2025-02-04 12:49 ` Janneke Nieuwenhuizen
  2025-02-04 13:43   ` bug#76050: " 宋文武 via Guix-patches via
  0 siblings, 1 reply; 3+ messages in thread
From: Janneke Nieuwenhuizen @ 2025-02-04 12:49 UTC (permalink / raw)
  To: 76050; +Cc: iyzsong, iyzsong

iyzsong--- via Guix-patches via writes:

Hello!

> From: 宋文武 <iyzsong@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

Please add a Copyright line.

+ ;;; Copyright © 2025 Sou Bunnbu <iyzsong@gmail.com>

Otherwise LGTM!

Greetings,
Janneke

-- 
Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com




^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#76050: [PATCH] gnu: libxcb: Fix build for Hurd.
  2025-02-04 12:49 ` Janneke Nieuwenhuizen
@ 2025-02-04 13:43   ` 宋文武 via Guix-patches via
  0 siblings, 0 replies; 3+ messages in thread
From: 宋文武 via Guix-patches via @ 2025-02-04 13:43 UTC (permalink / raw)
  To: Janneke Nieuwenhuizen; +Cc: 宋文武, 76050-done

> Otherwise LGTM!
>
> Greetings,
> Janneke

Pushed to master, thank you for the review!




^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2025-02-04 13:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-04 12:45 [bug#76050] [PATCH] gnu: libxcb: Fix build for Hurd iyzsong--- via Guix-patches via
2025-02-04 12:49 ` Janneke Nieuwenhuizen
2025-02-04 13:43   ` bug#76050: " 宋文武 via Guix-patches via

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).