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 MHgNHSw0vma0AwEAqHPOHw:P1 (envelope-from ) for ; Thu, 15 Aug 2024 17:00:28 +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 MHgNHSw0vma0AwEAqHPOHw (envelope-from ) for ; Thu, 15 Aug 2024 19:00:28 +0200 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=er5QB06+; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=V7YBorbI; 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=1723741228; 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=QskDqBznHXIAEin9J3Y476wIY9KKG73eVuu68ssnE/0=; b=MqrP+yljV9egVtWn9s5m5nMzmutZsIqjG5sY7YHT48lfGFYNHHJ2lODqRiRFLtulRW1zF0 H0Vz5hGGKLEmZQSuO1FemQxf/+JtsM31xDGgvLP7iakXQxADJmkabPQA59K4riffBSmdz/ 3hWMJ2GDbQHcXXWakXdU/yAKAZYbVrrybwjSsn+fwtP3kFWE/4L/u8YcAeU3PWxiTXY6BF OyjT3fU9vuy3rmh7zSBP5qhgznXBPefXeP31XydOthNcyqDqKycXPAY5GcBIaJd34ZhFap 5U4SAAuElajHOC/iUwpgm6qSwGWiMH6ZbBmwHJsQ7HGbc34p1FRE0JUU0qiuBQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1723741228; a=rsa-sha256; cv=none; b=r+M2DYt2quHMcoDGThtPbfmiJyu9mUHGrPiv5FrqOjLcFKWROO/t8SSsNadQAWJK0CCxo1 H5Su2inNkmg31amFK4HyaR655mWEPYlOukECYZxySbFXM39bK9FxHvDvIfpXl0zRsPXxZN iyBy4Gch3L5CxipfMi/AWE6pVZ8e3CuROb9EgkHv9XOp/1UhH0qu+VZw85utA0SQvbG4Md xi/I4sC8Um7CFQWbdjwEYF1ncznHuU4uSx3PPbx5OxLLxjKCBioWuAdjweSY+Zf76xIYB5 kccioXplp/9CKBWU9C9MzmtkxhyjYPFMRrcUPuq1XaVrPtG530EG6ItjVMUsSA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=er5QB06+; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=V7YBorbI; 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" 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 5B10530FD7 for ; Thu, 15 Aug 2024 19:00:28 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sedpE-00028B-Eu; Thu, 15 Aug 2024 12:59:48 -0400 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 1sedp0-00024V-5w for guix-patches@gnu.org; Thu, 15 Aug 2024 12:59:36 -0400 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 1sedos-0003Se-Au; Thu, 15 Aug 2024 12:59:31 -0400 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=QskDqBznHXIAEin9J3Y476wIY9KKG73eVuu68ssnE/0=; b=er5QB06+Dy+F3stR00hgLL23W/kdFHe4UUsJCJ+gmUzkbBDdqqeLJfHw3BnTnPHQynv/xFGRidwp4z9drQc5dtSk4BH6zIAgqCno28zkE+QUkdkidO/E1QdAvLvbAhAqHQ9jKJNUgrSgOTOzs5vbWTxpHC6cxjwc/xY3hV8GNXc1kEuNJ3HT7HBKRbwhiXWO0xDMHSm2T+FU46h9eRQmOZLOe4IIBNBqv89/Yrw9XUtq1Uzm08SUn2bFBPqY6XSlMux4uyCnV8CqyXbg/lCHdkkZEazid/fHLxO8aW6RmZuInLUmbOJWI0fNqt16HkLNmdxEtMtY9y7irgqDex803Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sedpS-0003SA-Mc; Thu, 15 Aug 2024 13:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72643] [PATCH core-updates 1/6] gnu: make-bootstrap: Fix cross-compilation of =?UTF-8?Q?=E2=80=98%glibc-stripped=E2=80=99.?= Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, guix-patches@gnu.org Resent-Date: Thu, 15 Aug 2024 17:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72643 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72643@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 72643-submit@debbugs.gnu.org id=B72643.172374117013147 (code B ref 72643); Thu, 15 Aug 2024 17:00:02 +0000 Received: (at 72643) by debbugs.gnu.org; 15 Aug 2024 16:59:30 +0000 Received: from localhost ([127.0.0.1]:49658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedov-0003Pt-Fu for submit@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sedot-0003Pc-N0 for 72643@debbugs.gnu.org; Thu, 15 Aug 2024 12:59:28 -0400 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 1sedoE-0003QM-0R; Thu, 15 Aug 2024 12:58:46 -0400 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=QskDqBznHXIAEin9J3Y476wIY9KKG73eVuu68ssnE/0=; b=V7YBorbIiazyftVjYgBF jZv3m2OihPozvCDQyVfjV/4uINS0utQKZKh/sWjDj7VOH+g2PWETL/z8XEXxe+9d7p0SS63GJmeWc PFEZXhHFTKZgCnjBAq//9/tU/qjYlHCTNR3vt00e6EfOkbDtT3C2JwT+FHowrBooT2XTnX0SEKUBk S/U/nMEdC7WCKb9F4e5MvbsiAnPmfZlxeJLsFeQptAhCgKhW21hwBSigTsZlMHkvu6GY7xdZPyTo1 hAF7x+eTd8eHNH64Fd0iHXnd4s3zww62J7AMqtmmVqKnLw7wP1bzZABN8jakAVLwUZ+7/VISngFMD TE+LngbglO0seg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 15 Aug 2024 18:58:29 +0200 Message-ID: <01749753fe8eb0e5889024310d6ddb12f740637d.1723740352.git.ludo@gnu.org> X-Mailer: git-send-email 2.45.2 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-Queue-Id: 5B10530FD7 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -8.07 X-Spam-Score: -8.07 X-TUID: T3GyTBgDckfD Previously, ‘guix build bootstrap-tarballs --target=aarch64-linux-gnu’ or similar would construct a cross-libc where ‘%current-target-system’ is set. This would lead to a failure in the ‘add-cross-binutils-to-PATH’ phase, which assumes that ‘%current-target-system’ is #f; indeed, ‘cross-libc’ already returns a cross libc and so ‘%current-target-system’ must be set to #f. * gnu/packages/make-bootstrap.scm (%glibc-stripped)[inputs]: Move libc to… [native-inputs]: … here. Change-Id: Ifbf5e519ba3198940f4de4a36075d5302e923172 --- gnu/packages/make-bootstrap.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index d5b6b818b3..679aa46d60 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -448,19 +448,20 @@ (define (%glibc-stripped) (make-stripped-libc (assoc-ref %outputs "out") (assoc-ref %build-inputs "libc") (assoc-ref %build-inputs "kernel-headers"))))) - (inputs `(("kernel-headers" - ,(if (or (and (%current-target-system) - (target-hurd? (%current-target-system))) - (string-suffix? "-hurd" (%current-system))) - gnumach-headers - linux-libre-headers)) - ("libc" ,(let ((target (%current-target-system))) - (if target - (glibc-for-bootstrap - (parameterize ((%current-target-system #f)) - (cross-libc target))) - glibc))))) - (native-inputs '()) + (native-inputs + `(("libc" ,(let ((target (%current-target-system))) + (if target + (glibc-for-bootstrap + (parameterize ((%current-target-system #f)) + (cross-libc target))) + glibc))))) + (inputs + `(("kernel-headers" + ,(if (or (and (%current-target-system) + (target-hurd? (%current-target-system))) + (string-suffix? "-hurd" (%current-system))) + gnumach-headers + linux-libre-headers)))) (propagated-inputs '()) ;; Only one output. -- 2.45.2