From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id YNeaFMy8JGa4bgEA62LTzQ:P1 (envelope-from ) for ; Sun, 21 Apr 2024 09:14:20 +0200 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 YNeaFMy8JGa4bgEA62LTzQ (envelope-from ) for ; Sun, 21 Apr 2024 09:14:20 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dan.games header.s=fm1 header.b=rkKtZOrn; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b=iY1+VkMW; dmarc=none; 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=1713683660; a=rsa-sha256; cv=none; b=jUuNGFV39RQoTFKdVCcavUj2Qidf38SbBwv+IOwdmDguLftkkdeUP/IeBq7IW8mDA1yvVx 9fJ6HLnn8kCPqA3eOtSLSgDt2xWFvRvrSR5uu8fWTRmSEYYoapm5d2HN9V9vPn94/+3M5W /rgPlU2vQDduULmk0uv6lwssPHi9+V4vpiayQ/CqVyCLHM4MrcoDatN0UqQwMS3THBQ9Kj 0uBgzRDR6/W0cP1h+ykv2I3dnNVVxKhSf9gDE0nCyt4K6GRW14Erf9yac1oI/QZzjN/z/+ OT2HJSeQQs4vMIuEZDhRsc9OJTroMxH9coxO0Y24+0hmOMwbPbOBwFfKcOJOng== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dan.games header.s=fm1 header.b=rkKtZOrn; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b=iY1+VkMW; dmarc=none; 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=1713683660; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=smjwGDe4mtQX9yoB/9DEM5TgzP0D7EX26RYAQQS9mZk=; b=Lumolke0ti4KsD1KeOznswZrUQ1m3xVvMIrfoXSXUfHNn1TW4T0nDnkQ+BKVehFfYq44rG QogPYU3CajuaVwdw0HQkcZTV76ArxHxeaKSzyluUJlSZ3qxx5Dirt3ZJnItnAOgO05ssMM KSDfuqGpaQX/5UWVL1mMXnaDuionCe4SS0fewXJ/Dm3S+6F0n90cgdtyyYHC+8ezyBteCv uMn7Ut9tEJUKWlb41MFu9OpbTjRz6XBkyrw5tzVgcbggadCO53ZAP/rCFzbzpqyHKMMcvT 3mhM0IUVCOg5HX9voWT7sVn0tAPKsdupC4iI9VBtiF2A8MWkhvczAC6dG8Y3CQ== 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 C9B2B20543 for ; Sun, 21 Apr 2024 09:14:19 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ryROb-000772-65; Sun, 21 Apr 2024 03:13:53 -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 1ryROY-00076W-Uh for guix-patches@gnu.org; Sun, 21 Apr 2024 03:13:51 -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 1ryROY-0008Mb-L7 for guix-patches@gnu.org; Sun, 21 Apr 2024 03:13:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ryROn-0002dI-C8 for guix-patches@gnu.org; Sun, 21 Apr 2024 03:14:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70492] [PATCH] build-system: copy: Fix cross-compilation. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Apr 2024 07:14:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70492 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70492@debbugs.gnu.org Cc: david.elsing@posteo.net, othacehe@gnu.org, ludo@gnu.org, efraim@flashner.co.il, 66866@debbugs.gnu.org, janneke@gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17136835989794 (code B ref -1); Sun, 21 Apr 2024 07:14:04 +0000 Received: (at submit) by debbugs.gnu.org; 21 Apr 2024 07:13:18 +0000 Received: from localhost ([127.0.0.1]:41112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryRNz-0002XW-Lo for submit@debbugs.gnu.org; Sun, 21 Apr 2024 03:13:17 -0400 Received: from lists.gnu.org ([2001:470:142::17]:54480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryRNw-0002WA-KJ for submit@debbugs.gnu.org; Sun, 21 Apr 2024 03:13:14 -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 1ryRNb-00072O-Nf for guix-patches@gnu.org; Sun, 21 Apr 2024 03:12:51 -0400 Received: from fhigh5-smtp.messagingengine.com ([103.168.172.156]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ryRNZ-0008BC-6d; Sun, 21 Apr 2024 03:12:51 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 71F5911400AB; Sun, 21 Apr 2024 03:12:45 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 21 Apr 2024 03:12:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm1; t=1713683565; x=1713769965; bh=sm jwGDe4mtQX9yoB/9DEM5TgzP0D7EX26RYAQQS9mZk=; b=rkKtZOrncsVH3bw9lJ WGKLTPY1JAvGOXouxSVDW0eBIQIYPO+SED2mat3OUz2A7Uyls8dQXF6TxLl/QWYu sO+UAMuRwllgISD46nqSce19+wpXVpp1z+sb1FCKfyk5zvOaVQgLfzFo1rjyaIQZ SSXOsfHEGfJF5BxcIIPyVhhgDxC+PQUzrzCOCF16ft+sEi393nv7aWjVMsZqTW9v P8enfHiOW07iv0/hnPabMIIRghHOG/yimeHIVxTWDVlFQVAZ9C2ZUEm3dyNA6NxM 4rrfW7/7PwDjXSAW6WcAianBIHpVWXMOPgoYFuyEuNt4YHxbCPbbdov0S26TSoDR 0ysQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1713683565; x=1713769965; bh=smjwGDe4mtQX9 yoB/9DEM5TgzP0D7EX26RYAQQS9mZk=; b=iY1+VkMW0I7SuUiGyrxIsh2DSK3Wh zEB0IgwU66n6AT+G1x8KmfaC7N8YoaharL4ABaYRpCXuQC5+/MulrUPoU3zUDY2M Q6eQ+wULpAnjF8ye/+/G9Vr999ShN7diBAnRZsyHQ2gVxd44MGuQVADxjkC0SQIr 51C1TaGzUhL/w9vSmOegaHwQWNDhGReyh2Rd2H7CoYWBJtAVibKbpvq3YqX1WrP/ cMygVxg9MD9CqSt2lRZU7N8WhULqSl1RS6aP9usauNz8uVEGyljmtgZQh5t82JqC 0uqYRpunjFqw4b362aX0hDcgV3uevKhzJFr/N59dlpZrYPB5l+JDsnmoA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudekiedgudefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgfrhhlucfvnfffucdludejmdenucfjughrpefhvf evufffkffogggtgfesthekredtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhg rghmvghsqeenucggtffrrghtthgvrhhnpeefveejteeguedtjefhtdekfeehveevgfekhf ehheekteeutefhtdeiuddthfeghfenucffohhmrghinhepghhnuhdrohhrghenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrdhgrg hmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 21 Apr 2024 03:12:37 -0400 (EDT) From: dan Date: Sun, 21 Apr 2024 15:12:30 +0800 Message-ID: <20a614ca2a6064bfa597cd11b7b87ceb926de866.1713682643.git.i@dan.games> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=103.168.172.156; envelope-from=i@dan.games; helo=fhigh5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-Spam-Score: -4.48 X-Migadu-Queue-Id: C9B2B20543 X-Migadu-Spam-Score: -4.48 X-Migadu-Scanner: mx10.migadu.com X-TUID: CosT38DH7v60 * guix/build-system/copy.scm (lower): Change arguments passed to host-inputs and build-inputs. Change-Id: I2991854b48587ab00ccc03712304e2850727e6b7 --- This patch tries to fix a issue related to grafting when cross-compiling. See https://issues.guix.gnu.org/66866 for more discussion. guix/build-system/copy.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index d58931b33c..64bd61a53f 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2021, 2022 Ludovic Courtès ;;; Copyright © 2023 Jonathan Brielmaier +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,13 +67,13 @@ (define* (lower name (bag (name name) (system system) - (host-inputs `(,@(if source - `(("source" ,source)) - '()) - ,@inputs - ;; Keep the standard inputs of 'gnu-build-system'. - ,@(standard-packages))) - (build-inputs native-inputs) + (build-inputs `(,@(if source + `(("source" ,source)) + '()) + ,@inputs + ,@native-inputs + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(standard-packages))) (outputs outputs) (build copy-build) (arguments (strip-keyword-arguments private-keywords arguments)))) base-commit: 38b88d710ea13ba024aed0543bc2862772cdb645 -- 2.41.0