From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MLgtCLoIzmAdEgEAgWs5BA (envelope-from ) for ; Sat, 19 Jun 2021 17:09:46 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id cFTJA7oIzmAFEAAAbx9fmQ (envelope-from ) for ; Sat, 19 Jun 2021 15:09:46 +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 8995D2C5E3 for ; Sat, 19 Jun 2021 17:09:45 +0200 (CEST) Received: from localhost ([::1]:58820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucbQ-0005XW-J6 for larch@yhetil.org; Sat, 19 Jun 2021 11:09:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXx-0007vh-89 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48880) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXw-0007uV-WC for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXw-0005fG-S7 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 14/36] wrap-python3: Fix cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512621486 (code B ref 49025); Sat, 19 Jun 2021 15:06:08 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:26 +0000 Received: from localhost ([127.0.0.1]:60372 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXF-0005aI-Cl for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:25 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX5-0005VG-Ch for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:15 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Fpr; Sat, 19 Jun 2021 17:05:15 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:36 +0200 Message-Id: <20210619150458.12057-15-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115115; bh=ZMsN/6s+7XOcEFFTYApZei2dN0Kil09FxGyx/JO3NH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bhq7lm9lCoB2JVEKIxulMUquAaQKTv4CEOUu+1efUnj00H2udkdCPgLpETzqHn/EO dGuciIA0OYSTe4lwI5c0Id3h3ND1MCSGR38PiWtoc1B6N/g7tpXHjk9N4NV7ToC246 J1HjqJVHqBZxqoY2mpzLOEKv8yLgKbb6dhDjCU0eiW9NXbZAO7BFWtNmVwzKyAKJJj SkypBXGvDm5/1+dsqvJudCtRw9ipVNf5hYnItAXwivd2V3W77dKtX07UAeRsxJERah bxIYe6+l+uC6veHHSZSGqFRqt+QrobIMNOWLbe5jo7L58w/hmEpljKGM+qSE2KekOp GCjK/I9eSIRkQ== 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=1624115385; 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=ZMsN/6s+7XOcEFFTYApZei2dN0Kil09FxGyx/JO3NH0=; b=J4p7sSUni5Y5cSM2tTD9PhdZMsyqr3kUqy8perhZZqfv1FND0B/hdW/sZwS4xM4pD5PF2e di394RXFBuzT6OTuD8Ibk92+okPaZz1lw4Y7JuXD92SzndgbAST/hfP7wTsvy+plz1ev8S 2pNWZb1DXtYGoruE+feE5UyrVaT/9j02cJz+B2Gyzf9aqznYH71w1D9CbBCr/C2NMD+BfB wWCmkrGRt4qA4up9cQrqwgrFgUFMGnZ57aRKfdVgD+SOfuzdRfSgiKjTbDzbtMTNtHoatj 3H318bTVoksWv4YlRd6n2KZtoUWOMbu8S5kz/H73ZhK7JauzY5u0e56qFYhZcw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624115385; a=rsa-sha256; cv=none; b=is1QakZGyTX5YK+ISKEgS6bbV9+W7ga2TWbq29rj3PYjqQlZ5NAsJjhiJh/jCN238L11UG fLJQEDMCvUEMF4YJFyO9REdeF5JfBc849Fpbql7BEqYXUcAyd1gHyqs+38X8uyf04VpRnr 6gskXUTFz/vdWjzr2aqjVxDr8hsTSp+kji5m5JeamYpkqKv/XZtg+FQAbJ8M2nngLr9SG4 iLIoL4spw1P+nl+IpJ2kLWsMq2WhhxkSYUerIa+U1ZIGw5hdMjUQivkBD3n05+B1khULdJ LA4QI/mIBZmHcbVFuIeT+MEW0TkFE+UhbMpBhQwGIg6B7PVmgJ08SxXWY426Aw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=bhq7lm9l; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); 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: -0.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=bhq7lm9l; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); 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: 8995D2C5E3 X-Spam-Score: -0.32 X-Migadu-Scanner: scn1.migadu.com X-TUID: L5TFMjT6AVCB When cross-compiling, "bash" is missing from %build-inputs, leading to a build error. Use this-package-input instead of %build-inputs to resolve this. While we're at it, eliminate all uses of %outputs and %build-inputs. * gnu/packages/python.scm (wrap-python3)[arguments]<#:builder>: Eliminate %outputs and %build-inputs. --- gnu/packages/python.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fe8b93b1ba..8688104463 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -60,6 +60,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020, 2021 Greg Hogan +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -638,9 +639,9 @@ for more information."))) #:builder ,#~(begin (use-modules (guix build utils)) - (let ((bin (string-append (assoc-ref %outputs "out") "/bin")) - (python (string-append (assoc-ref %build-inputs "python") "/bin/"))) - (mkdir-p bin) + (let ((bin (string-append #$output "/bin")) + (python #$(file-append (this-package-input "python") "/bin/"))) + (mkdir-p bin) (for-each (lambda (old new) (symlink (string-append python old) @@ -649,8 +650,7 @@ for more information."))) `("python" ,"pydoc" ,"idle" ,"pip")) ;; python-config outputs search paths based upon its location, ;; use a bash wrapper to avoid changing its outputs. - (let ((bash (string-append (assoc-ref %build-inputs "bash") - "/bin/bash")) + (let ((bash #$(file-append (this-package-input "bash") "/bin/bash")) (old (string-append python "python3-config")) (new (string-append bin "/python-config"))) (with-output-to-file new -- 2.32.0