From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id cDTGNcU3PGfLbQEA62LTzQ:P1 (envelope-from ) for ; Tue, 19 Nov 2024 07:01:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id cDTGNcU3PGfLbQEA62LTzQ (envelope-from ) for ; Tue, 19 Nov 2024 08:01:25 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=AZl4qZiN; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=gphuD+Dw; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731999685; a=rsa-sha256; cv=none; b=kDwwZm54ARvuBCD0w2srBXwdoeJBwa9BvmYNQD14WFOkkobwy2fQGqG5gikzdM+RRWHZha S1JzfY8q8wk8ThXgSmQA2v3PcldgMx8y9otMvP1nqAt1fiCEPOQ4euAi7kW1PetHXvUJtb EmmTCEM4Z8NRIzmcECHIhrHx95XD5CIQFbSvFsJmiE8ayL1cYm0OJ0juc6Om+MLPD6CTMT 57nwstxiNJL09PYNiSnFjigMzHh+vATmdgrjhV+UmLIEYqmtS1x288srm2zvV+L+9sar5L 4e5FfXZmdzc+6p+Ef1DGN9wZkRhRKSK268zjT8GglYVRcr9Hw4t1HQHoEVq6OA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=AZl4qZiN; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=gphuD+Dw; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1731999685; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=zF43VOco6aqIFdqJ22hyYazvSN62LpGEcNUrlszboHM=; b=FAOLfVm+WVv4xn3+I0V7HftAbaniNk6AORmotnOCqHIVGMdcVL/wJOIgFaAMDw/kdlLRwp j92CMXkSkcADSPKLPlLUwfUSsqhxGZB+6eI4yWC7RL/mVfuePJkzG5XXfYVNj85JLQQAG6 i8n87srxOjkdx5zaBBWFYsvCQABihz06GhuCKcIGtegrswALmDbo3pgFpyWtHgk6xO9vz+ lc7Tlr/9v8J7kPlcT91zuFcMXf1BELYJmwmM0zPW1onir/qaaLtDEy2QxA5jumJaoGXkY8 U/ZetuDiLcONb43cK7P7uz/sinTfBAGMvq+K8s1EPwkq/nkXTybYldojM6ljrA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7DF9F18144 for ; Tue, 19 Nov 2024 08:01:25 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDID1-0000B0-Vy; Tue, 19 Nov 2024 01:59:36 -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-0008WH-Hs 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 1tDICo-0004Lq-Q2 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=zF43VOco6aqIFdqJ22hyYazvSN62LpGEcNUrlszboHM=; b=AZl4qZiN4VTu0sEHBqQT7oLb84hhABGGf3HRZoooGCVel+dzXV9d/AguUpmO2fnA9dH9S3drduC7T0gkdWRhQK6iix0yHRXFEzLaDlulNs9pn1hdxLgyf1JEFR1Nx1CoGQGkpxBYZDHzi74AyIWcOn5GA8Y+FWTUDqVuQSJKqsSJWKq/2SMxwY+kGqPfohEqFJT7kr5b9ZC2QVCiIWUjFIR6DD6wwyn34WQhVnYoFrzalZi/x0UEQ9gVGi7kvH3pQB7D71C4G0DOL7RKcDOP1Ng6R9VCRc0Bt8BmHw4OsZA3VWRUSwdNBW8jG+6QQrU4IEJqPxqhec6qkif+7KnRSQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDICo-0005Jn-LO for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:22 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 30/51] gnu: pciutils: 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:22 +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.173199955020238 (code B ref 74290); Tue, 19 Nov 2024 06:59:22 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:10 +0000 Received: from localhost ([127.0.0.1]:40593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICb-0005G2-Ll for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIC3-0005AD-PM 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 1tDI9r-00041m-U6; 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=zF43VOco6aqIFdqJ22hyYazvSN62LpGEcNUrlszboHM=; b=gphuD+DwB9is5b4Xu5Pf 1XI+Wg34OXXiz/3hVlxpmiEZDkUeBYgrKchoU30sXJZqyzopKcmdMAvkmjGt4bO97eycfsHC9bxxB OnzJggntAmtBvQnXEIrjkjPi6QTrv+kJ//mC/tr7hTJF8G7EWylph2TohXS+D2jf/c7hZ9ht9SWd2 wFY8VnqzZJE9NimLHeLmcO4as1c3dIVNeL1RVxxx+9vQAnN4B3l7zEvcr7tu0UuXSz3SZZN6VwGXi GXe89K54zsJ2cyUa9IqwLNQ5N8+5FAll8eel6YSnp5QAxWre2WHuoWbxjh8Y5Ofivzhj5Y3fHq2vr fyxKGLUTFXm8GQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:00 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.44 X-Spam-Score: -4.44 X-Migadu-Queue-Id: 7DF9F18144 X-Migadu-Scanner: mx10.migadu.com X-TUID: Aa4m71jfAFcW * gnu/packages/patches/pciutils-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/pciutils.scm (pciutils)[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 + gnu/packages/patches/pciutils-hurd64.patch | 31 ++++++++++++++++++++++ gnu/packages/pciutils.scm | 25 +++++++++++------ 3 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/pciutils-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index a0408d20f2..89042a0716 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1916,6 +1916,7 @@ dist_patch_DATA = \ %D%/packages/patches/pam-krb5-CVE-2020-10595.patch \ %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/password-store-tree-compat.patch \ + %D%/packages/patches/pciutils-hurd64.patch \ %D%/packages/patches/pdfpc-build-with-vala-0.56.patch \ %D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ diff --git a/gnu/packages/patches/pciutils-hurd64.patch b/gnu/packages/patches/pciutils-hurd64.patch new file mode 100644 index 0000000000..316f12e131 --- /dev/null +++ b/gnu/packages/patches/pciutils-hurd64.patch @@ -0,0 +1,31 @@ +Upstream-status: Not presented upstream. + +--- pciutils-3.8.0/lib/hurd.c.orig 2024-11-07 15:09:20.728973822 +0100 ++++ pciutils-3.8.0/lib/hurd.c 2024-11-07 15:05:08.524682813 +0100 +@@ -213,7 +213,7 @@ + hurd_read(struct pci_dev *d, int pos, byte * buf, int len) + { + int err; +- size_t nread; ++ mach_msg_type_number_t nread; + char *data; + mach_port_t device_port = device_port_lookup(d); + +@@ -266,7 +266,7 @@ + mach_port_t device_port = device_port_lookup(d); + struct pci_bar regions[6]; + char *buf = (char *) ®ions; +- size_t size = sizeof(regions); ++ mach_msg_type_number_t size = sizeof(regions); + + int err = pci_get_dev_regions(device_port, &buf, &size); + if (err) +@@ -305,7 +305,7 @@ + struct pci_xrom_bar rom; + mach_port_t device_port = device_port_lookup(d); + char *buf = (char *) &rom; +- size_t size = sizeof(rom); ++ mach_msg_type_number_t size = sizeof(rom); + + int err = pci_get_dev_rom(device_port, &buf, &size); + if (err) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index d2a352eb6b..08f1634113 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Mathieu Othacehe -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2022 Brendan Tildesley ;;; Copyright © 2022 Marius Bakke ;;; @@ -81,25 +81,34 @@ (define-public pciutils "01aglgw9ds9qiswcbi2lx90lswncikrlyv8mmp4haix8542bvvci")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases + (list + #:phases + #~(modify-phases %standard-phases (add-after 'unpack 'unbundle-pci.ids (lambda* (#:key native-inputs inputs #:allow-other-keys) (copy-file (search-input-file (or native-inputs inputs) "share/hwdata/pci.ids") "pci.ids"))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch "pciutils-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch-file))))) + #~()) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) ;; There's no 'configure' script, just a raw makefile. (substitute* "Makefile" - ,@(if (%current-target-system) - `((("^CROSS_COMPILE=.*$") + #$@(if (%current-target-system) + #~((("^CROSS_COMPILE=.*$") (string-append "CROSS_COMPILE=" - ,(%current-target-system) "-" + #$(%current-target-system) "-" "\n")) (("^HOST=.*$") (string-append "HOST=" - ,(gnu-triplet->nix-system + #$(gnu-triplet->nix-system (%current-target-system)) "\n")) ;; Disable 'install' strip option, that would fail when ;; we are cross-compiling. @@ -139,7 +148,7 @@ (define-public pciutils (invoke "make" "install" "install-lib")))) ;; Make sure programs have an RPATH so they can find libpciutils.so. - #:make-flags (list ,(string-append "CC=" + #:make-flags #~(list #$(string-append "CC=" (if (%current-target-system) (cc-for-target) "gcc")) -- 2.46.0