From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp2.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 0NH1FzfgQmfMgQEAe85BDQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 08:13:43 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp2.migadu.com with LMTPS
	id 0NH1FzfgQmfMgQEAe85BDQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:13:43 +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=cFDzokb0;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Pm1yrP5r;
	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=1732436023; a=rsa-sha256; cv=none;
	b=a6aW20W1vZr0IQeiX/GKFtmPY+DETS34CJZZf3yxet+Qk9rRlZZw6K8Nxo/ukEfR22Ab1R
	ZXGOQQLahA/prlqEW6u5LaTqC2soy1VUKvwV3hvpMeLT0xoi345bNLyEGEB4L8Dd8WqED4
	DvUJE2Rlfmx5taFrObS/kUT3rhMWW0Dj3m0hATlXPSy/u3CnPp7n7BlK3iD1D2gzOfOAyO
	S87Q5eDO+uH4d2zjCIn4eWn96VE2SeSTCmXw6Cby41HVpU4v1+hK3sk0rGPaGIeiH4nVjX
	PlJpaaApdNQOHqJi9WW0NDYfM6ymQA0EafDSCZ9fj1k//Jv01Bm+Cb8Toz6U4A==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=cFDzokb0;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Pm1yrP5r;
	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=1732436023;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:mime-version:mime-version:
	 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=p/fc0uQcseXNqhyISel/qHQYVRi4koMAZyjnGE676gI=;
	b=a3VPaudqE/tfoh8QhqwggiCgQUPDHqB74tH+xV7ui10qIiYBMFgj8mKqencDyMfG2mTp+1
	sfj9aoOmqxwU1KZBluWJCCOfQfj2EeHxoAHIghLtcU7FdtMs8pYS8salC9CzDRL4JRC5Kg
	GbNw/yL4NSoAZGWkB03RLw4GSMJLq6v/uwdP3+lVYi/l/S3GaGJOQ9lgLPFObikonkRscN
	Ife3soIbhIVU1C5BqwVXYNOhNbu0+jj3fy0cd+EaQ/2WcD5rhUV3HhWi2naXahRje+k1Kv
	euyU/oS44TOGoGUrgZr7MZc93pcbfSK8r3wy3cdc6F6k3i9w1tfgJbRg9JPZ0Q==
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 4A93C3DF7
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:13:43 +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 1tF7WT-0002Cd-NG; Sun, 24 Nov 2024 02:59:13 -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 1tF7Ul-0000Qz-1m
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:30 -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 1tF7Uj-0002PR-H4
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:25 -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=p/fc0uQcseXNqhyISel/qHQYVRi4koMAZyjnGE676gI=; 
 b=cFDzokb0P15Pk220KCyrimKdIsS6j2vEkrydXSSpyDWFJU/KCnZ9nH/aN+goxq8XRcrcUtwdw2aWQICtt+P2t0GYTxTLsV+feAVE709YN05QMkM8onfe5sGR+vl0WPb8Xa+mgVOP39DC0jhf6x9gXicrOnGsHXT1l/v4U7hSeeyJ9mbEFNopYZwp6ojqmhDloW+WY711bkqgvnIZEnTk+LNPaAHQv/lQeOYyb6Kgv+eUG23SiUi3yy2c4IgEuTJ85ZSnL2L0F/HZ/c4VMWmObWBTuwzTTMLr98GY6GlOFdg/jg1TZa7DBJa0DdywrEdSYg1bBBetpyLlVBWXdE9eLA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tF7Uj-0004lz-8q
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:25 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v4 37/58] gnu: rumpkernel: Support the 64bit Hurd.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Sun, 24 Nov 2024 07:57:25 +0000
Resent-Message-ID: <handler.74290.B74290.173243503318126@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
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503318126
 (code B ref 74290); Sun, 24 Nov 2024 07:57:25 +0000
Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:13 +0000
Received: from localhost ([127.0.0.1]:60840 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tF7UX-0004i5-47
 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:13 -0500
Received: from eggs.gnu.org ([209.51.188.92]:55732)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tF7Tv-0004aI-R3
 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:36 -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 1tF7Tq-0002DY-B7; Sun, 24 Nov 2024 02:56:30 -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=p/fc0uQcseXNqhyISel/qHQYVRi4koMAZyjnGE676gI=; b=Pm1yrP5rE4jYzLCJ6mD1
 znVg5DM5LIgoEyQhSPk3F+lDiOE0UYXPL1aRlGOn/zQoolETdMIFH1Ni9Z3sBONr6BfX8W6qAnEif
 qqygvbYIAOAtiRvF1nX8gYJcZ9HFpkLYwIo4rypEgTTQYA3GFPox/V84twP/u2a4R0tiQNhDjK0vG
 RKo3g3zuJH/I8NXN3OuLWr7RyvbjO10Mgw7LlD4oZHUzPvMa3Q27C3oTRLF9Tts5x3xam8NWK42E6
 33LTtfkHMLxlyaUBPLiw6LSvG+gd/5xzfsLU8SV/F/iEjmpjavsmaSbzuHzBngoKZl/a3gCDZig8t
 jkg9SKRJn2u7KQ==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Nov 2024 08:55:00 +0100
Message-ID: <ea5a9587f56c27b1e2c062c5c17422e99e6b3b21.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-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: -1.83
X-Spam-Score: -1.83
X-Migadu-Queue-Id: 4A93C3DF7
X-Migadu-Scanner: mx12.migadu.com
X-TUID: CZNmIkVF74fR

* gnu/packages/hurd.scm (rumpkernel)[argument]: In stage "build", follow
Debian upstream to use -DPAE disable the DTRACE and ZFS builds.

Change-Id: I534da31eefb378c72b4896d64a51a73109e38aa6
---
 gnu/packages/hurd.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 0df514cc78..6701d00251 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -792,6 +792,9 @@ (define-public rumpkernel
                      "-V" "MKBINUTILS=no"
                      "-V" "MKGDB=no"
                      "-V" "MKGROFF=no"
+                     "-V" "MKDTRACE=no"
+                     "-V" "MKZFS=no"
+
                      "-V" (string-append "TOPRUMP=" toprump)
                      "-V" "BUILDRUMP_CPPFLAGS=-Wno-error=stringop-overread"
                      "-V" "RUMPUSER_EXTERNAL_DPLIBS=pthread"
@@ -802,7 +805,8 @@ (define-public rumpkernel
                            " -DRUMP_REGISTER_T=int"
                            " -DRUMPUSER_CONFIG=yes"
                            " -DNO_PCI_MSI_MSIX=yes"
-                           " -DNUSB_DMA=1")
+                           " -DNUSB_DMA=1"
+                           " -DPAE")
                      "-V" (string-append
                            "CWARNFLAGS="
                            " -Wno-error=maybe-uninitialized"
-- 
2.46.0