From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp1.migadu.com ([2001:41d0:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id OAxbOAjgQmeIPwAA62LTzQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 08:12:57 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp1.migadu.com with LMTPS
	id OAxbOAjgQmeIPwAA62LTzQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:12:57 +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=UxyrlKau;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=mpU8In7T;
	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=1732435976; a=rsa-sha256; cv=none;
	b=AlVmZKw4JxRZ45LtuPo1aNWamEADJRld1T8pwi8+6RTfcFVK1mI9aUDDDLVTjkH+WRXKuY
	4qyxinJGzk+7mAh5kFpo2nnng1kTpr1RwBJpCTUXLtQ3iN0iWgd6mcXjDgtqAisSR773eo
	Fb1x0hjcTRXad5w1UD+KaQlVSrrYoJzFmR9zxwNhl8Sb85GgkzwJhk2gmP3sEFCWNMf865
	VCFFeJuxh+ddB/KM2O3JcIL1GuokUglEb8xYmC3mIZtfuN6ne2eGtkIgOU7/kIBdX2qBuQ
	n/83gugw8w/r0e3wJzzAQ60JWGgjqbJFNonkT6HlrV7mjTumtPduHddS3SJV4w==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=UxyrlKau;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=mpU8In7T;
	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=1732435976;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc: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=0r633+B0XmsTRsQM5B7hxULPdUeBnT9mqg/vjV9ck3k=;
	b=dh73vPH1U6nXQSZNA4pOv+eNEV0F3zNWlhl5DUN+86cIGT3qNhZbyhkV4dXWvBXCUu7Erw
	ihr/boE9b/GV5FJ0W7Dn+vF8WCjhFtFlOacwhZeyTV2nmUb+lQwVbqYYAju2raM1MVsjDu
	hShlBRpjglJrFDj5D+aF1E+aaDmXTN2tElyciB8o0deAetsHpc2hVoQU31m9GAaMxLsxE8
	ej0DsqywxAPFJ6iMWiV91DPz4xgttAOyYAsNPIMCfZ8yys5JyTKpaUSsFP4JK9uhxxfra/
	IEbaM6uMK2sXl2g5qw1/KyHtSXG+n5blnpeIYlbn4tFKER6VxUJGJNZgiix/wg==
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 7C1433DEF
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:12:56 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1tF7VJ-0000lp-6i; Sun, 24 Nov 2024 02:58:01 -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 <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7Uo-0000SG-Uu
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -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 <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7Un-0002Q1-0Z
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57: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=0r633+B0XmsTRsQM5B7hxULPdUeBnT9mqg/vjV9ck3k=; 
 b=UxyrlKaudG3bWnR2Q3tMMRn2OuZ8x2Y3GIxg0grts9vCxZEtR9XaxrKiQ+4emiD8wM/KZIWR7YbSgGDD4epU9qZlp/ahwMdMCuvovNTmagKrAA+tSB/Bc0Ct+wsTs9bNIYgHfoeHCN2NcwOa4uzHBgK0Ium34jBFag2GGzSY6ppS4H+DvSPWY+QcrowuhT6BiVv+X9TZD4iVSa7emUY21F9Ld/eLRPitAlxBoPKM1IgLSXVyQTf3G4ESZRVDg3sUWg+zNm23t0gVPKBPp+e75q34I5sLSxA6jvBPUtLYFHeoIwUgxOWsy5LBeQQkrNNnA1MjDRgw7ivYt3NTwRGDhA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7Ul-0004ms-JI; Sun, 24 Nov 2024 02:57:27 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v4 40/58] gnu: grub: Fix build for the 64bit Hurd.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org
Resent-Date: Sun, 24 Nov 2024 07:57:27 +0000
Resent-Message-ID: <handler.74290.B74290.173243503618180@debbugs.gnu.org>
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
Cc: Efraim Flashner <efraim@flashner.co.il>,
 Vagrant Cascadian <vagrant@debian.org>
X-Debbugs-Original-Xcc: Efraim Flashner <efraim@flashner.co.il>,
 Vagrant Cascadian <vagrant@debian.org>
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503618180
 (code B ref 74290); Sun, 24 Nov 2024 07:57:27 +0000
Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:16 +0000
Received: from localhost ([127.0.0.1]:60853 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tF7UZ-0004iw-Ho
 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:16 -0500
Received: from eggs.gnu.org ([209.51.188.92]:55756)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tF7U0-0004al-3B
 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:40 -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 <janneke@gnu.org>)
 id 1tF7Tu-0002FR-Sh; Sun, 24 Nov 2024 02:56:34 -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=0r633+B0XmsTRsQM5B7hxULPdUeBnT9mqg/vjV9ck3k=; b=mpU8In7TiBiaVOOct4eL
 awbpfISh1c0BvWi5GSaZ8Ev9Lzq3tRMt3lVK4a5vqEFA74kpeJcHLA4BEOcwH84eaJFnHfZTXTcAT
 vNmDnM6c5YS6hd4uFKb7P/6wHlzASPcFp1gGSKJDDLJwc2fC7n6QytUnv85nAGRnYptxce/L9iJJe
 zRuroW1poZJsxD7SUyaWEohZcc+hvCmgTGNv/VuKw1YVCNdO/r3DxcKIcekyKHOz8ddwrJKqSLqrf
 uf7NgmdVvP96ySSwCVDnmdfFdkcM0aRQbrpRhmcen3pyPcwXNwq2ueYtvRmOJepHsPS3c2DIA/GkX
 l3sZ+28aS8D86A==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Nov 2024 08:55:03 +0100
Message-ID: <83559b59e4ba686c97349edba97af73f443df071.1732434271.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1732434270.git.janneke@gnu.org>
References: <cover.1732434270.git.janneke@gnu.org>
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: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: US
X-Migadu-Spam-Score: -2.33
X-Spam-Score: -2.33
X-Migadu-Queue-Id: 7C1433DEF
X-Migadu-Scanner: mx12.migadu.com
X-TUID: Xg3EhZsaCXfG

* gnu/packages/patches/grub-hurd64.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/bootloaders.scm (grub)[arguments]: When building for the 64bit
Hurd, use it in new "apply-hurd64-patch" stage.

Change-Id: I780f6a92418b49e5fe0d23eb1c90e155216f1428
---
 gnu/local.mk                           |  1 +
 gnu/packages/bootloaders.scm           |  8 +++++++
 gnu/packages/patches/grub-hurd64.patch | 32 ++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 gnu/packages/patches/grub-hurd64.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index c8fbae91fc..3595c68800 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1494,6 +1494,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/gromacs-tinyxml2.patch			\
   %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch	\
   %D%/packages/patches/grub-efi-fat-serial-number.patch		\
+  %D%/packages/patches/grub-hurd64.patch			\
   %D%/packages/patches/grub-setup-root.patch			\
   %D%/packages/patches/guile-1.8-cpp-4.5.patch			\
   %D%/packages/patches/guile-2.2-skip-oom-test.patch            \
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index da5abaca55..61ea74b69a 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -192,6 +192,14 @@ (define-public grub
                        (setenv "BUILD_FREETYPE_CFLAGS"
                                (string-append "-I" freetype
                                               "/include/freetype2"))))))
+               #$@(if (target-hurd64?)
+                      #~((add-after 'unpack 'apply-hurd64-patch
+                           (lambda _
+                             (let ((patch
+                                    #$(local-file
+                                       (search-patch "grub-hurd64.patch"))))
+                               (invoke "patch" "--force" "-p1" "-i" patch)))))
+                      #~())
                (add-before 'check 'disable-flaky-test
                  (lambda _
                    ;; This test is unreliable. For more information, see:
diff --git a/gnu/packages/patches/grub-hurd64.patch b/gnu/packages/patches/grub-hurd64.patch
new file mode 100644
index 0000000000..d5acd99eb8
--- /dev/null
+++ b/gnu/packages/patches/grub-hurd64.patch
@@ -0,0 +1,32 @@
+Upstream-status: Not presented upstream.
+
+From a4eb7d1f2cbd02132a9f5512f1294182576d4653 Mon Sep 17 00:00:00 2001
+From: Janneke Nieuwenhuizen <janneke@gnu.org>
+Date: Fri, 8 Nov 2024 11:47:49 +0100
+Subject: [PATCH] osdep/hurd: Support the 64bit Hurd.
+Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=UTF-8
+
+* grub-core/osdep/hurd/getroot.c (grub_util_find_hurd_root_device):
+Use mach_msg_type_number_t instead of size_t.
+---
+ grub-core/osdep/hurd/getroot.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/osdep/hurd/getroot.c b/grub-core/osdep/hurd/getroot.c
+index 0efefdab4..b849700e6 100644
+--- a/grub-core/osdep/hurd/getroot.c
++++ b/grub-core/osdep/hurd/getroot.c
+@@ -58,7 +58,7 @@ grub_util_find_hurd_root_device (const char *path)
+   file_t file;
+   error_t err;
+   char *argz = NULL, *name = NULL, *ret;
+-  size_t argz_len = 0;
++  mach_msg_type_number_t argz_len = 0;
+   int i;
+ 
+   file = file_name_lookup (path, 0, 0);
+-- 
+Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
+Freelance IT https://www.JoyOfSource.com | AvatarĀ® https://AvatarAcademy.com
+
-- 
2.46.0