From patchwork Tue Feb 4 12:45:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "King, Spencer via Guix-patches\" via" X-Patchwork-Id: 38199 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 AC05327BBE9; Tue, 4 Feb 2025 12:42:22 +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=unavailable 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 B342C27BBE2 for ; Tue, 4 Feb 2025 12:42:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tfIFi-0006DZ-Ce; Tue, 04 Feb 2025 07:42:06 -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 1tfIFf-0006Cs-33 for guix-patches@gnu.org; Tue, 04 Feb 2025 07:42:03 -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 1tfIFe-0008G1-Mt for guix-patches@gnu.org; Tue, 04 Feb 2025 07:42: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=vzJ9KTxiWHSsSBPeu+vDMwtSKvdai0x+8yPl48s/ly8=; b=mSXfHDzGa11Ev7c1wh0X2RqDkJkmfpVAWIAxwk5vOQJeiHNjniO5zlsOYO4RxBrD42uwOLfiXHYxM4wIc+fxgHIk0l9q9GAPSYagpUcnplGbZQF70gUZQPqcovXIvtKC5paC/HpMrus/58EzKavIXrK4SyVn8GtzAdb3OqJc0dh5fTzcdgK44l1ZCc21yIeIzvJ/pk4uqjYLx6Mbm/uXI0zaDvdDFtLzkh3B4zwwJqVORX6XUo9t3lHJG1DsSHiL6sCR1kNwcQkrCxh2UiHDQ7waMclltY7v7xmcQt/tZNg0bBSdc7uZkqvPju2LsIXCnxqirkGIZz7zvlWt67vYcA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tfIFe-0008Pn-A6 for guix-patches@gnu.org; Tue, 04 Feb 2025 07:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76050] [PATCH] gnu: libxcb: Fix build for Hurd. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Feb 2025 12:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76050@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173867291332326 (code B ref -1); Tue, 04 Feb 2025 12:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Feb 2025 12:41:53 +0000 Received: from localhost ([127.0.0.1]:43034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tfIFV-0008PK-0X for submit@debbugs.gnu.org; Tue, 04 Feb 2025 07:41:53 -0500 Received: from lists.gnu.org ([2001:470:142::17]:38918) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tfIFR-0008P1-Uh for submit@debbugs.gnu.org; Tue, 04 Feb 2025 07:41:50 -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 1tfIFI-0006AM-EH for guix-patches@gnu.org; Tue, 04 Feb 2025 07:41:40 -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 1tfIFE-0008EF-Lr for guix-patches@gnu.org; Tue, 04 Feb 2025 07:41:39 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 7537F38A3EBD; Tue, 4 Feb 2025 12:41:33 +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 AlQl1aV6Ybu4; Tue, 4 Feb 2025 12:41:29 +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 12:41:28 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 6457c57f; Tue, 4 Feb 2025 12:45:10 +0000 (UTC) Date: Tue, 4 Feb 2025 20:45:07 +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: "King, Spencer 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: 宋文武 * 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(-) base-commit: 4fa41a04802c43dc4c064b7ac4c2e6a4e92f63b6 prerequisite-patch-id: c6037eae461ad0d2c2229c9dd69de59b8a86827a 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