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:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id WPVwCk/GMGeJgAEA62LTzQ:P1 (envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>) for <larch@yhetil.org>; Sun, 10 Nov 2024 14:42:23 +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 WPVwCk/GMGeJgAEA62LTzQ (envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>) for <larch@yhetil.org>; Sun, 10 Nov 2024 15:42:23 +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=bbD9s2r9; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=SZPLPuom; 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=1731249743; a=rsa-sha256; cv=none; b=StnQvOHd26V6awb3R7UHacgpnmgjv6WhTngzfyDrmT2344SL0jRo4JNHi19Z5KxME5tyPM epBHYyLk9djDMA+qZFHmvpKRbqNQsC4wg9aQ8oWZhLwMkALJ1vbEQuFhCm6YdXf78nD06X BqOGY374fhCqeRsKMntuHtckxQn9n3Pb+YIn60nqdUkO8zq9c4QulaOvOamNTxyRrNdoHi 1wpRqgCP2y8xdv8BH4jdWaZ7e7ZQlTMNv5qeAo8pJBJtc4y7wvdZ5oA02GCBnGDVJ5T/ct C6489atOWcyd330nuP7SFQHKLpL/vjXoOLbisxhUGzKfi3RGlDwifKll+NU/VQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=bbD9s2r9; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=SZPLPuom; 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=1731249743; 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=IphJTzrkmpB/Pf4rkchv3tNYMHB2Bdgm5o1tksaBkO4=; b=qtF9KrpegI2cONIUkiAL08yOJbiT8fEmgRNtrS5GlErd0/N8GD5aacq72cjWO/9dIfLkqI R5ZIbEyg4lubObvMb39MKCoNDBwleVgtebZB90o6XFw54/T1S7I3ODjT9HiRylwKPM92Ww yEttD+qDeYMEMkhO+sqoePjpBF8LB88xnlzUv2Dc2J9Ni5tuVw8FtAoy8lTEYtKMde5x95 xwmwwQCBY9avPL9gI0CiR6cl0KKaStmWo6rWdERGduqkw4nHMs6Rd2sXtWF7ODM9anLXJM U0Fyd5nPmes6z2SsUAoTO7S7ca9+kq02hNa++LodLoPdrvi5KhG1IiyAHbGccg== 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 DCE521B585 for <larch@yhetil.org>; Sun, 10 Nov 2024 15:42:22 +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 1tA98f-0000vK-5z; Sun, 10 Nov 2024 09:42:05 -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 1tA98c-0000uv-QB for guix-patches@gnu.org; Sun, 10 Nov 2024 09:42:03 -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 1tA98c-0006tO-HI for guix-patches@gnu.org; Sun, 10 Nov 2024 09:42:02 -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:Date:References:In-Reply-To:From:To:Subject; bh=IphJTzrkmpB/Pf4rkchv3tNYMHB2Bdgm5o1tksaBkO4=; b=bbD9s2r9jkagO6bND17pBcuQHltj1CRH8kzCefihm/nxHSrPwEki+KOlaYPcGTB9q4CmT7D064prAeU0CkQHWmeAG2QxHXEHim12mBpGTZBGTWSixnV8B+02A16EeMA5beJOmUT3FulIkzR6zpvKBCAMswAdowGRZqTfFZZ1sSedPLk9d7F26La6fGCh2SbHW6sUTNcnLiA4tSzfmPmrmIfzZG49W2oAq3jYl47E99BPTO3XlsjfV6jBvnqJXUNgatPnz2X1mdgNoe7w4imL4naud62L/x6Kmnnm72MQH8Np9gNKNID1ih1LF/OxBzhjY7yYLGuoMqE8Xfx49CYIhA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tA98c-0005Fi-Ba for guix-patches@gnu.org; Sun, 10 Nov 2024 09:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 31/31] system: hurd: Use 64bit gnumach for the 64bit Hurd. Resent-From: <janneke@gnu.org> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 14:42:02 +0000 Resent-Message-ID: <handler.74290.B74290.173124968020135@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.173124968020135 (code B ref 74290); Sun, 10 Nov 2024 14:42:02 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 14:41:20 +0000 Received: from localhost ([127.0.0.1]:56267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1tA97v-0005Eg-Jy for submit@debbugs.gnu.org; Sun, 10 Nov 2024 09:41:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@gnu.org>) id 1tA97s-0005EO-VX for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 09:41:18 -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 1tA97m-0006on-GF; Sun, 10 Nov 2024 09:41:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=IphJTzrkmpB/Pf4rkchv3tNYMHB2Bdgm5o1tksaBkO4=; b=SZPLPuomFiuehN59o6Td Njcn0DIDXQKSATUQixyN74cx5deanFSNU/IAJ0B0fGk8X+LAqA7IChHmZoZW7X97qM7R6fh/4EyJP Zh7hnOp0BGAJQQqUzbbK65jCjlZuaWwVmEOxJry4S6cHyz9tsj6I1HLT2kCBQauRxGUPfARYbzPqH b/qPU7R57voR9VGjzjmbMxVvxqpDFsNc7MEfJrWXyOPiyM7cRQxxqp8+Qur6AtsvH2Vj12RowQG2M vm4NOmRgyf1jek4iyttvQ5hJtLPsBjBV/jqrM/GqlacOeWx9JmCCuowhQL4s0FDDrA9wL3indWL7I FVQE1FzTJejayA==; From: <janneke@gnu.org> In-Reply-To: <52f615e031e134f37d20b5bda18e24391c6654c0.1731232753.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Sun, 10 Nov 2024 11:38:27 +0100") Organization: AvatarAcademy.nl References: <cover.1731232753.git.janneke@gnu.org> <52f615e031e134f37d20b5bda18e24391c6654c0.1731232753.git.janneke@gnu.org> X-Url: http://AvatarAcademy.nl Date: Sun, 10 Nov 2024 15:40:23 +0100 Message-ID: <874j4fywx4.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.56 X-Spam-Score: -3.56 X-Migadu-Queue-Id: DCE521B585 X-Migadu-Scanner: mx10.migadu.com X-TUID: 6bp48kHK4WGR Janneke Nieuwenhuizen writes: > * gnu/system/hurd.scm (%hurd-default-operating-system-kernel): Use > actual (%current-target-system) to specify (%current-system) instead of u= sing > hardcoded "i686-linux". > > Change-Id: Ifc179bce221b1a54461860c24ba400cf6932ec86 > --- > gnu/system/hurd.scm | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm > index 9a351529e8..58e41959f4 100644 > --- a/gnu/system/hurd.scm > +++ b/gnu/system/hurd.scm > @@ -18,6 +18,7 @@ > ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. >=20=20 > (define-module (gnu system hurd) > + #:use-module (ice-9 match) > #:use-module (guix gexp) > #:use-module (guix profiles) > #:use-module (guix utils) > @@ -64,9 +65,13 @@ (define %hurd-default-operating-system-kernel > (if (system-hurd?) > gnumach > ;; A cross-built GNUmach does not work > - (with-parameters ((%current-system "i686-linux") > - (%current-target-system #f)) > - gnumach))) > + (let ((system (match (%current-system) > + ((? target-x86-32?) "i686-linux") > + ((? target-x86-64?) "x86_64-linux") > + (_ "i686-linux")))) > + (with-parameters ((%current-system system) > + (%current-target-system #f)) > + gnumach)))) This is obviously wrong; the idea was to do something like --8<---------------cut here---------------start------------->8--- (let ((system (match (or (%current-target-system) (%current-system)) ((? target-x86-32?) "i686-linux") ((? target-x86-64?) "x86_64-linux") (_ "i686-linux")))) (with-parameters ((%current-system system) (%current-target-system #f)) gnumach)))) --8<---------------cut here---------------end--------------->8--- ...but as %hurd-default-operating-system-kernel is a variable that is evaluated at toplevel/too early, this also doesn't work. Ideas? Janneke --=20 Janneke Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com