From patchwork Tue Nov 19 06:55:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70562 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 13E8127BBEA; Tue, 19 Nov 2024 07:01:58 +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 47C6F27BBE2 for ; Tue, 19 Nov 2024 07:01:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDICz-000076-3e; Tue, 19 Nov 2024 01:59:33 -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 1tDICx-0008W2-EF for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:31 -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 1tDICp-0004Lz-Ai for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:30 -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=5WmN5s4SEXDdwi7Ezhtzk//j4Xdmdm1VRGzTnrF69cQ=; b=P2gLJR2qW1Og42b8V56MPHcFOdV03bFIrQXmvwn/mDwfqF5RX+7ZUpmuuWvGS3FAjaqKRS4mCRdcbRISBUTeafPF6cK/jAJfwHiWsagjafqUVdUudd7mWhSvgAFOrxG9sDr9R8riJM6w1UWDsmyp0DK+eYVOpeoiKEozrC6UMje8LLqko6KzUmSocWnU+nHRGeXtOA+dVC9AVOyQvHZ0cZ1KUYUktQr0Qbhgu7U743QHW1TIkEmRNLx1ZoFPAHgouZxogjiNEdsqDyjJBeDZdRsM0PNgDenFa+4i3EjY3XeiGhPLOwIST8LwSh8HsTOmLmW//qAkMqRKZm2eHfZhBA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDICp-0005Ju-3W for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 31/51] gnu: libpciaccess: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59:23 +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.173199955120256 (code B ref 74290); Tue, 19 Nov 2024 06:59:23 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:11 +0000 Received: from localhost ([127.0.0.1]:40598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICc-0005GM-M5 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIC3-0005AE-Pr for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:37 -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 1tDI9s-00041r-Oh; Tue, 19 Nov 2024 01:56:21 -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=5WmN5s4SEXDdwi7Ezhtzk//j4Xdmdm1VRGzTnrF69cQ=; b=bXxb+FjobD8qWgeeyevu HgJgrOgyCxPi/vBcEr8O9qTroOwHq6krYNb1fAf97ki2mRZfkaLme1MYBf9n2D9RbXkV/S7JvE6S4 gSKIqqWkCZo7mjQdvb/psP1QELqY0ngccZmJCyvPQ/X+1iJJIwu1UzUoDwP1jDqWvc6dalEzY+K/x vrU/3LqPE00BmY1Lt4KPxLB7RtNH9T+d8xGmEnGxuKEniY10f7fS3lPZYuj8bSiDfeFTT3XFCviVD RzTKFzTfu3yElLUiqbQE3WEpFObDxkexHKXqcYxshr8EfuFV5lWfHP6/VesXPfztFjKnfs9rX8JXv fxm5yfNmp5Ug5A==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:01 +0100 Message-ID: <4e74903a8a7627615bd7d14334f10ef09e755c79.1731999203.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 89042a0716..b6e25cd43d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1711,6 +1711,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