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 qBj9BQ/nQmfBiAAA62LTzQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 08:42:55 +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 qBj9BQ/nQmfBiAAA62LTzQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:42:55 +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=noolP12P;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=UCNwWsfH;
	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=1732437774; a=rsa-sha256; cv=none;
	b=GXwuGbeMgw4bFvzMizjglfBbv4WuGM5frjoeOWp4YMiJZwB7c0Y8z3DEKu+CWL7g+6fqAi
	syGdS3hmidJxrF9CP2FQyn2v5SI8keRqr8bvYFDP8XuIYdWMzaLWKTEofsSPvKhxL1RYk4
	0pCSWDp5Yyy1KMhymTZJonU98669BFKVSyhjS0gY2uAryL1Ag/Yt/j8xAnWY93JjZ7uwgT
	y2Pb9GtLGPQAv2p+x38MTW8vGSXuHKYO43Mpjg4KgUCUu4NdDMft6j/Vda2jHcqQ9B/Sgp
	+xBORSQyDCpw4yB1urA0Dy2ZF+E+WxRWbQnUgSg/fcAfrcj/4HUNrX7PSKZg1g==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=noolP12P;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=UCNwWsfH;
	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=1732437774;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc: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=c8onV7OhuF9SSTXP9WNCS6hOWvgt/CoTjai2PjzC0k0=;
	b=oozDVOXg7fOTvEKPi70OUW8jWQtGNZ4i4lC8g7MYG1DsmXEv8oOQVvTdCOvqY9Qy3QzF1j
	Juopw2/gcb79ixIYfWD1RrQMXXNy/d+Ej4KQ99XmGLzrufcNcgTclKOETskH/SWpNf1r89
	MQbDLHMuv/ubDF3UrmEtHSeyRbKfnrHqIUK67wW3Jtel1SRRDxtcmwyM1/MwZp4cR8+zf5
	2z7WfQCzpFMqW756xSBxwcUjGnhfkRohV5rhl/JB3Hb5D0PVisxrT9xHW25VdKuUVvRwPA
	MeZCw1NLeIArUvOx3JQU75TdLvQGigw4Fd7261RrBWGHbT23YGmvxX+gXbEhmw==
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 A4F3F51A9
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:42:54 +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 1tF7UP-0000AT-68; Sun, 24 Nov 2024 02:57: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 1tF7UN-00009r-29
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57: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 1tF7UM-0002Jq-PD; Sun, 24 Nov 2024 02:57: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:References:In-Reply-To:Date:From:To:Subject;
 bh=c8onV7OhuF9SSTXP9WNCS6hOWvgt/CoTjai2PjzC0k0=; 
 b=noolP12PBljH0kLcLJ+o4z0e4txBlAeHpuY+wXlZWGvo4iQ06VzJVkDZ0WlDTIpslgRxhw84HDzcUs1iE8mUkErVmfQaxnzOTFTxPSZ2toKdN/jgllSKn3VHgxd6vBXB3Akg8lSWnGeHIr937h+fekUj6r+rJFEzxZHmr8/2A0yE6yiMt6fMrBBmSaMejHIiRFI0//7uJ2k514DLUAX7DSSZ/ZGGPJ+sTuEFt5nXgR6ZXjY62zw9QEsvvomDsBT/BsyUT6Em1v0rNouDkhEqZjYTy3yDU/doxM47LNe8lcN8lkzW36LeYQ2oUZNPvWSTQoOn1X5RrMRY+37qgVx+zA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7UM-0004ei-Im; Sun, 24 Nov 2024 02:57:02 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v4 05/58] gnu: cross-libc: Support cross-building
 for the 64bit Hurd.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org
Resent-Date: Sun, 24 Nov 2024 07:57:02 +0000
Resent-Message-ID: <handler.74290.B74290.173243497117418@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: Andreas Enge <andreas@enge.fr>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
X-Debbugs-Original-Xcc: Andreas Enge <andreas@enge.fr>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497117418
 (code B ref 74290); Sun, 24 Nov 2024 07:57:02 +0000
Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:11 +0000
Received: from localhost ([127.0.0.1]:60665 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tF7TW-0004Wq-GT
 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:10 -0500
Received: from eggs.gnu.org ([209.51.188.92]:37472)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tF7TJ-0004Th-Kf
 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:58 -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 1tF7TE-0001sM-9p; Sun, 24 Nov 2024 02:55:52 -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=c8onV7OhuF9SSTXP9WNCS6hOWvgt/CoTjai2PjzC0k0=; b=UCNwWsfHQ5FwIyh7UYLQ
 fRQDzVZJXqe4K+nMADimaosAF4KT0rg+NdDUsMkSnglSjMG5SlJrn8ERHSNC3kioVJC7iAA6cNxtz
 JvWae1q9vROyH3pENZNMjK+BsGWnfs7OT9a3sskDRXV+8v6ryun0t/jSaDozRqRCnLe1EikCGMyBL
 Ka+uJw+Lx7PXmFFwshyfrn5enwJ5VuZgrTRVjZwHB5P9NXz9xjeJbiR6YZ6cOF8G443nyhMJTt3ij
 ryd6QOqUwN7eyt2p+BLFrNGEuQxJtPk21Fbh94MFaq8asQoh3TyhW4EfgV0x/WGqJuivVb9QjoLuV
 vZuSIu5wkHozqg==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Nov 2024 08:54:28 +0100
Message-ID: <1f12ffca4c4a35a169686b44412d2d377177a76e.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: -3.03
X-Spam-Score: -3.03
X-Migadu-Queue-Id: A4F3F51A9
X-Migadu-Scanner: mx12.migadu.com
X-TUID: 9Pi4Z8WmQ6jP

* gnu/packages/base.scm (glibc)[arguments]: When building for the Hurd, in
phase "create-machine-symlink", do not assume CPU is i386, also cater for
x86_64.
* gnu/packages/cross-base.scm (cross-libc*)[arguments]: Likewise.

Change-Id: Ib009b7bd301b543b8629382330cca9d963b7a812
---
 gnu/packages/base.scm       | 9 +++++++--
 gnu/packages/bootstrap.scm  | 2 +-
 gnu/packages/cross-base.scm | 8 ++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 90c25b54e1..02ef71f20d 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1079,7 +1079,7 @@ (define-public glibc
                                (string-append locale "/C.UTF-8")))))
 
                  ,@(if (target-hurd?)
-                       '((add-after 'install 'augment-libc.so
+                       `((add-after 'install 'augment-libc.so
                            (lambda* (#:key outputs #:allow-other-keys)
                              (let ((out (assoc-ref outputs "out")))
                                (substitute* (string-append out "/lib/libc.so")
@@ -1089,7 +1089,12 @@ (define-public glibc
                          (add-after 'install 'create-machine-symlink
                            (lambda* (#:key outputs #:allow-other-keys)
                              (let* ((out (assoc-ref outputs "out"))
-                                    (cpu "i386")
+                                    (cpu ,(match (or (%current-target-system)
+                                                     (%current-system))
+                                            ((? target-x86-32?)
+                                             "i386")
+                                            ((? target-x86-64?)
+                                             "x86_64")))
                                     (machine (string-append
                                               out "/include/mach/machine")))
                                (unless (file-exists? machine)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 33cbaa30ae..27798fe278 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -311,7 +311,7 @@ (define* (glibc-dynamic-linker
                                         gnu-triplet->nix-system)
                                  (%current-system))))
   "Return the name of Glibc's dynamic linker for SYSTEM."
-  ;; See the 'SYSDEP_KNOWN_INTERPRETER_NAMES' cpp macro in libc.
+  ;; See the appropriate 'shlib-versions' file in libc.
   (let ((platform (false-if-platform-not-found
                    (lookup-platform-by-system system))))
     (cond
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 83672ab383..4961b3b4c0 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -738,7 +738,7 @@ (define* (cross-libc* target
                (delete 'install-utf8-c-locale)
 
                ,@(if (target-hurd? target)
-                     '((add-after 'install 'augment-libc.so
+                     `((add-after 'install 'augment-libc.so
                          (lambda* (#:key outputs #:allow-other-keys)
                            (let ((out (assoc-ref outputs "out")))
                              (substitute* (string-append out "/lib/libc.so")
@@ -748,7 +748,11 @@ (define* (cross-libc* target
                        (add-after 'install 'create-machine-symlink
                          (lambda* (#:key outputs #:allow-other-keys)
                            (let* ((out (assoc-ref outputs "out"))
-                                  (cpu "i386")
+                                  (cpu ,(match target
+                                          ((? target-x86-32?)
+                                           "i386")
+                                          ((? target-x86-64?)
+                                           "x86_64")))
                                   (machine (string-append
                                             out "/include/mach/machine")))
                              (unless (file-exists? machine)
-- 
2.46.0