From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.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 IA09CaGNM2dljAAAqHPOHw:P1 (envelope-from ) for ; Tue, 12 Nov 2024 17:17:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id IA09CaGNM2dljAAAqHPOHw (envelope-from ) for ; Tue, 12 Nov 2024 18:17:21 +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=REyqcAbG; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=APk+0XaD; 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=1731431840; a=rsa-sha256; cv=none; b=hg+sZVjpmrxoecDy4tC07KlzCIU67VAFVYVngG35NT85KeGO/pnl8LvQps8Q/2BVgG2QSt zL4FPy8pCCmQzsjXbJdY1WMitIJJhnkmiQoBPIXfqLnXpovna1vyNiMhtvacO0j+2oAqS3 31q6KdFYVglewrfO4CGN9CxjYJ8KxVlNcHnau6AbWtlIYy9PGilgiS94Ia0BAY6C15lX5v jWzTgHFeGDziek1Re8b2h3JbFTx94pt1yzpXARMxjH2KsTLkcxrI5K+fQe6GZoatL6bxTt Be6agcyk59hUbctpX5Azyhr2Lvm9DyJLK9ECTUQ/mgjNamOLAJy4MkA/AQMZTw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=REyqcAbG; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=APk+0XaD; 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=1731431840; 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=U3393vj9SLGcR9xYmbaMJUzCKszCGGKYXMuqOdjZjJg=; b=lmKtbpguWgnUr98StyEx1yUg+2miG/qtUs5Ca0AkjvFtMSFUw/GxoYoPGSZnSrSifRzZP+ a3KwVf+YEGyLxMDtzV35VXU87CJl1Go5g/atz2S4fWVKX+hjG1RuiJ/lxqgI5/6zCnQ5uU /OkI0sVRFmakEGL/rzTxyy/VJsV7y3I3rg0sdXjh+JAS5/k/ZP4Ez8RUsG5vwxejoqNgT1 H9tK3YZIOPPXEj28gw+8IQp2SkXqLrR3w3GsHP1+SCI50mWKpObAAjqKNM+8Wp9VeUS3Iv V0JIYKnqmW9HQ4yNnBfSbkJ93i5MXAcfG4Ad5taz1bmVpjU11kCZuhtdjdEdWQ== 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 B589C808DF for ; Tue, 12 Nov 2024 18:17:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmL-0003ac-3R; Tue, 12 Nov 2024 11:30:09 -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 1tAtmJ-0003Vp-75 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:07 -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 1tAtmI-0005s3-U6; Tue, 12 Nov 2024 11:30:06 -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=U3393vj9SLGcR9xYmbaMJUzCKszCGGKYXMuqOdjZjJg=; b=REyqcAbG5jUvDj1vwJiFirpE2sQZcObJmHFxiY/s7aSTD+R2Oow9FdoEVv9Wfqn/8c1YcT7/ocm2QBf20XbUqczL31WEMAY8gZuv0kzmj1gOHht0uY2CCMv0+XtKO2qSWcacaMlITE8PzrlZYLFxvoWOXq5wR8qUklWZjZyJ/yxrJKlIXmc/YwQMb/c1BcAma6VBc/UzBgqtgMSRivB4LdaD/oLt8SgSEXucIGDyN35XkutnokY7k+syTL3dA4A80V0kC62VnZz3uVrgiFQiJn4gVStA/gUqSxE0Uztzylp7F1GfmNVrlrtVWyL/2VPDVmLvVgxS5gmq/FedYdgnog==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmI-0000Qs-Lz; Tue, 12 Nov 2024 11:30:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 06/40] gnu: cross-libc: Support cross-building for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:06 +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 Cc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289621117 (code B ref 74290); Tue, 12 Nov 2024 16:30:06 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:22 +0000 Received: from localhost ([127.0.0.1]:39073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlY-0000Ho-RO for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlP-0000Fw-5b for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:13 -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 1tAtjE-0005Kn-8c; Tue, 12 Nov 2024 11:26:56 -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=U3393vj9SLGcR9xYmbaMJUzCKszCGGKYXMuqOdjZjJg=; b=APk+0XaD1yfgs8ikGtGZ krqVw/TP+AJd0Ih1+rC3ADpA2+lxPM7GFsmiGkdtUboviWpTacFf4Orz1cFf0BSYUl+BWYsM3YKki 5zB7fsOWTwN+St14BgCDCwKm46FilLBk7BRPyffXX/iHM4XqToIQuDChVmVD01vSu35mEX7OZZxaI ajNUdyadDcWDNdILTS6H6ufzyrQkpcyeFwDQs/bj12DxTkhUhh/tAxLIlfUw57yI8mvHGsf2GsrDD rX1NOytxJC/Ot6CrMJom66PZuq19o/oOD5uis3JOoEo9OPqDmdnyb7kmnkdD1QwHvgHybIJqmGsvq CJxayzcIjKtVTQ==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:15 +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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 1.38 X-Spam-Score: 1.38 X-Migadu-Queue-Id: B589C808DF X-Migadu-Scanner: mx12.migadu.com X-TUID: i8BlAjD2JOD5 * 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 | 18 ++++++++++++------ gnu/packages/cross-base.scm | 17 +++++++++++------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 4e8121ae2c..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") @@ -1088,11 +1088,17 @@ (define-public glibc " libmachuser.so libhurduser.so")))))) (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (cpu "i386")) - (symlink cpu - (string-append out - "/include/mach/machine")))))) + (let* ((out (assoc-ref outputs "out")) + (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) + (symlink cpu machine)))))) '())))) (inputs `(("static-bash" ,static-bash))) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 7b32a6b64e..3827e87aec 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") @@ -747,11 +747,16 @@ (define* (cross-libc* target " libmachuser.so libhurduser.so")))))) (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (cpu "i386")) - (symlink cpu - (string-append out - "/include/mach/machine")))))) + (let* ((out (assoc-ref outputs "out")) + (cpu ,(match target + ((? target-x86-32?) + "i386") + ((? target-x86-64?) + "x86_64"))) + (machine (string-append + out "/include/mach/machine"))) + (unless (file-exists? machine) + (symlink cpu machine)))))) '()))))) ;; Shadow the native "kernel-headers" because glibc's recipe expects the -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com