From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0OudHvhOkWCXBAEAgWs5BA (envelope-from ) for ; Tue, 04 May 2021 15:41:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id MOFMGvhOkWDOdgAAB5/wlQ (envelope-from ) for ; Tue, 04 May 2021 13:41:12 +0000 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 3801E1343F for ; Tue, 4 May 2021 15:41:12 +0200 (CEST) Received: from localhost ([::1]:40962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldvIV-0003Ge-CD for larch@yhetil.org; Tue, 04 May 2021 09:41:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldvIM-0003FW-H3 for guix-patches@gnu.org; Tue, 04 May 2021 09:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41749) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldvIM-0006Tt-Aq for guix-patches@gnu.org; Tue, 04 May 2021 09:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ldvIM-0007tE-7a for guix-patches@gnu.org; Tue, 04 May 2021 09:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48224] [PATCH 2/2] gnu: guix: Phases refer to #:system and #:target. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 May 2021 13:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48224@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 48224-submit@debbugs.gnu.org id=B48224.162013561830303 (code B ref 48224); Tue, 04 May 2021 13:41:02 +0000 Received: (at 48224) by debbugs.gnu.org; 4 May 2021 13:40:18 +0000 Received: from localhost ([127.0.0.1]:53291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldvHe-0007sh-Bc for submit@debbugs.gnu.org; Tue, 04 May 2021 09:40:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldvHc-0007sL-E6 for 48224@debbugs.gnu.org; Tue, 04 May 2021 09:40:16 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:51835) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldvHW-0005po-Ak; Tue, 04 May 2021 09:40:10 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=59102 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ldvHV-0006JJ-PF; Tue, 04 May 2021 09:40:10 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 4 May 2021 15:39:58 +0200 Message-Id: <20210504133958.11011-2-ludo@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210504133958.11011-1-ludo@gnu.org> References: <20210504133958.11011-1-ludo@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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1620135672; 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; bh=cowGhol/Y80ZDaSD0BSXoitKBcRMXZ8poY+L22Ge0Rc=; b=niQ/EuQCKx9sf/5Q9EKKpoMkXqYF25kfuXwSWLTNpMVcvR5RQ85oHG54yaFvrKczWVuEKD GcYyLD/ooI9uVDvHaYPJMPSv8/a5Gj+BIW9tBuEkttg+fifNiVrEHAJlE2oPnfe3baVgWa sySMWNXJA+k1kXKOxYBCj1D4PLPqf6UWZr2DRMseOLNDcJ2Qr+d3blY/kg3tY3YxXhoAZD 4faxULL8Xo+UgvcC+MalUrUWgoX6/mNQqiSQMMCDgOPI6b0P/K6h17S8R3G914Sqgvq0eI aaH8U7ONoS6rt86hMyTgHHo6YzlFPAzOzrMFniJrCktvymnwpUVjIABigY4uAQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620135672; a=rsa-sha256; cv=none; b=JHvYXoJleogroolhtc456kV+TyTThzvfeTvtdh5yvg2NZrv17mMXaqz69bO/g4RVvR/tI8 YhPRhSioZFHO6dZQnQGfnte6jn4iICBeb5hjm63GS61ceo8Kg9cgnO4de328z16rEFi7U2 IaS4UHiU6WFQQ+ieh5STC6Q3eogrkb87j/yIj16wEHFKSUzBzFiPOdpQnh3nw2tS88+TRJ 6Js9eIV58WCJ18tu3TEoabSEuuHVrTB5OWg70JjdPUxUDiAsFM4CoAHaNezLuvR9EHhVcH liFMylGwCVKXZTQmNgJUu69PnGI5AxAzRmQw0PirQzFF3fKErA5NWluR7Nao+g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.04 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 3801E1343F X-Spam-Score: 2.04 X-Migadu-Scanner: scn0.migadu.com X-TUID: 0uEkvX9O03Bu * gnu/packages/package-management.scm (guix)[arguments]: In 'copy-bootstrap-guile' and 'wrap-program' phases, refer to #:system and #:target instead of unquoting (%current-system) and (%current-target-system). --- gnu/packages/package-management.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 1a637f9ec8..5c6937adb8 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -261,11 +261,9 @@ $(prefix)/etc/openrc\n"))) (intern (assoc-ref inputs "boot-guile") #f) ;; On x86_64 some tests need the i686 Guile. - ,@(if (and (not (%current-target-system)) - (string=? (%current-system) - "x86_64-linux")) - '((intern (assoc-ref inputs "boot-guile/i686") #f)) - '()) + (when (and (not target) + (string=? system "x86_64-linux")) + (intern (assoc-ref inputs "boot-guile/i686") #f)) ;; Copy the bootstrap executables. (for-each (lambda (input) @@ -299,9 +297,9 @@ $(prefix)/etc/openrc\n"))) ;; Make sure the 'guix' command finds GnuTLS, ;; Guile-JSON, and Guile-Git automatically. (let* ((out (assoc-ref outputs "out")) - (guile ,@(if (%current-target-system) - '((assoc-ref native-inputs "guile")) - '((assoc-ref inputs "guile")))) + (guile (if target + (assoc-ref native-inputs "guile") + (assoc-ref inputs "guile"))) (avahi (assoc-ref inputs "guile-avahi")) (gcrypt (assoc-ref inputs "guile-gcrypt")) (guile-lib (assoc-ref inputs "guile-lib")) @@ -318,9 +316,7 @@ $(prefix)/etc/openrc\n"))) (locales (assoc-ref inputs "glibc-utf8-locales")) (deps (list gcrypt json sqlite gnutls git bs ssh zlib lzlib zstd guile-lib)) - (deps* ,@(if (%current-target-system) - '(deps) - '((cons avahi deps)))) + (deps* (if target deps (cons avahi deps))) (effective (read-line (open-pipe* OPEN_READ -- 2.31.1