From patchwork Tue Nov 12 16:25:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70295 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 8C7DA27BBE2; Tue, 12 Nov 2024 16:31:06 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 ADCCE27BBE9 for ; Tue, 12 Nov 2024 16:31:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmZ-00044l-Jm; Tue, 12 Nov 2024 11:30:23 -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 1tAtmV-00040g-5K for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:19 -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 1tAtmU-0005xk-Ss for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:18 -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:References:In-Reply-To:Date:From:To:Subject; bh=ePHU5oGULiK5Of28vD9j/MrGEdQXLa9lVkkv97eIsBI=; b=TLOtitb/Zk0KS+2gijkXqJ1WUNOq7RYXbEsqmhmFYn3rfD0Gx6ojT/J3EsLMWxXfF/XSYhc1zYTmV/sooF4g+TJg0b1Uw1vaWAH2AmN0n1jgU6ZkbtdWtPHNLEeHGzZrYuvsd1ULQBIpUKw3ov/AAksaSjVHrAYfqz1/IJ+82bEzmOmsTlGedm6cxWsshkYY72LIQe/ppDUx6PjIVGcCEM0bqJA7dObi42m6aGBoCKcQrAxlmR7yE3BrKD51tcsTtBjeaRK4Ijqny03Tx2nkTcCO2H7SUewYZomKkhjnpPu8WYo0KmC0plZl9/v4MFHdQcxEBSTJG0gXOphQA7uIMQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmU-0000Y8-Ea for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:18 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 21/40] gnu: libpciaccess: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:18 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289791348 (code B ref 74290); Tue, 12 Nov 2024 16:30:18 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:39 +0000 Received: from localhost ([127.0.0.1]:39133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlq-0000LW-Hr for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlf-0000IB-IQ for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:28 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjU-0005NM-RD; Tue, 12 Nov 2024 11:27:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=ePHU5oGULiK5Of28vD9j/MrGEdQXLa9lVkkv97eIsBI=; b=EJ0e0P6YHn7caF4h7Qi0 SuRgiBrAnRL2BGzB5xN7JYafUVwPzW9MKlrvZUvmrWEZx3z6sRfXDBRjBK+f44BxQF8XA1eeMu8rz HiKnXJPH/JusxgprGmRN32lnAI5ZqlfUaQhMXlYqtg/q8k22Gjm3GO9ouq+pLa6+dWzYDV+ShCzlX QcrENTamCHIYCCxmg7Rephcjhc3XouBJlqdJj70TETD7GFIjrC5Oy/6QGHsxYEHe7zID9moy5PP9z L+2CJjcuiMSwG6s7CtwbBjUwblOKhnI4lDEIZHc7I/JVFdhcNDvCZ0hxQGdDAPvBX4XqxQGrWJBXi BbJdxkPZFYwwbA==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:30 +0100 Message-ID: <68c9662ea16fdb7498a7a10ad36eafc923db5570.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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: , 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 * gnu/packages/patches/libpciaccess-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/xorg.scm (libpciaccess) [arguments]: Use g-expressions. When building for the 64bit Hurd, use it in new "apply-hurd64-patch" phase. Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05 --- gnu/local.mk | 1 + .../patches/libpciaccess-hurd64.patch | 58 +++++++++++++++++++ gnu/packages/xorg.scm | 23 +++++--- 3 files changed, 75 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/libpciaccess-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 34023909a1..8c4f052b75 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1703,6 +1703,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmpeg2-global-symbol-test.patch \ %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ + %D%/packages/patches/libpciaccess-hurd64.patch \ %D%/packages/patches/libphonenumber-reproducible-build.patch \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ %D%/packages/patches/libquicktime-ffmpeg.patch \ diff --git a/gnu/packages/patches/libpciaccess-hurd64.patch b/gnu/packages/patches/libpciaccess-hurd64.patch new file mode 100644 index 0000000000..f7e11059b1 --- /dev/null +++ b/gnu/packages/patches/libpciaccess-hurd64.patch @@ -0,0 +1,58 @@ +Upstream-status: Taken from upstream: + +. + +From 6cd5a4afbb70868c7746de8d50dea59e02e9acf2 Mon Sep 17 00:00:00 2001 +From: Flavio Cruz +Date: Wed, 28 Jun 2023 01:02:34 -0400 +Subject: [PATCH] Fix compilation warnings when building against hurd-amd64. +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + +Passes mach_msg_type_number_t instead of size_t which have different +sizes. Example warning: + +/hurd_pci.c:101:53: warning: passing argument 3 of 'pci_get_dev_regions' from incompatible pointer type [-Wincompatible-pointer-types] + 101 | err = pci_get_dev_regions(d->device_port, &buf, &size); + | ^~~~~ + | | + | size_t * {aka long unsigned int *} +--- + src/hurd_pci.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/hurd_pci.c b/src/hurd_pci.c +index 8653e1b..9ac3813 100644 +--- a/src/hurd_pci.c ++++ b/src/hurd_pci.c +@@ -82,7 +82,7 @@ pci_device_hurd_probe(struct pci_device *dev) + struct pci_bar regions[6]; + struct pci_xrom_bar rom; + struct pci_device_private *d; +- size_t size; ++ mach_msg_type_number_t size; + char *buf; + + /* Many of the fields were filled in during initial device enumeration. +@@ -323,7 +323,7 @@ pciclient_cfg_read(mach_port_t device_port, int reg, char *buf, + size_t * nbytes) + { + int err; +- size_t nread; ++ mach_msg_type_number_t nread; + char *data; + + data = buf; +@@ -473,7 +473,7 @@ simple_readdir(mach_port_t port, uint32_t *first_entry) + { + char *data; + int nentries = 0; +- vm_size_t size; ++ mach_msg_type_number_t size; + + dir_readdir (port, &data, &size, *first_entry, 1, 0, &nentries); + +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0de08a4ad1..b106a604a7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2021 Lu Hui ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2023, 2024 John Kehayias ;;; Copyright © 2023, 2024 Kaelyn Takata ;;; @@ -1157,16 +1157,17 @@ (define-public libpciaccess "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11")))) (build-system gnu-build-system) (arguments - '(;; Make sure libpciaccess can read compressed 'pci.ids' files as - ;; provided by pciutils. - #:configure-flags - (list "--with-zlib" + (list + ;; Make sure libpciaccess can read compressed 'pci.ids' files as + ;; provided by pciutils. + #:configure-flags + #~(list "--with-zlib" (string-append "--with-pciids-path=" (assoc-ref %build-inputs "pciutils") "/share/hwdata")) #:phases - (modify-phases %standard-phases + #~(modify-phases %standard-phases (add-after 'install 'add-L-zlib (lambda* (#:key inputs outputs #:allow-other-keys) ;; Provide '-LZLIB/lib' next to '-lz' in the .la file. @@ -1175,7 +1176,15 @@ (define-public libpciaccess (substitute* (string-append out "/lib/libpciaccess.la") (("-lz") (string-append "-L" zlib "/lib -lz"))) - #t)))))) + #t))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch "libpciaccess-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch-file))))) + #~())))) (inputs (list zlib pciutils)) ;for 'pci.ids.gz' (native-inputs