From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KBrsDQPWzGDrYgAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 19:21:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id GIGZCQPWzGALSgAA1q6Kng (envelope-from ) for ; Fri, 18 Jun 2021 17:21:07 +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 A9EC6136D9 for ; Fri, 18 Jun 2021 19:21:06 +0200 (CEST) Received: from localhost ([::1]:50142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIAz-0008JW-9s for larch@yhetil.org; Fri, 18 Jun 2021 13:21:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA4-0007kE-Pg for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46553) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA4-0004Av-F8 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA4-0004su-Bi for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 14/37] wrap-python3: Fix cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403676718468 (code B ref 49025); Fri, 18 Jun 2021 17:20:08 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:27 +0000 Received: from localhost ([127.0.0.1]:58038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9O-0004ni-H3 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:26 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI99-0004j3-HO for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:12 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKBcA; Fri, 18 Jun 2021 19:19:11 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:08 +0200 Message-Id: <20210618171631.20534-14-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-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=1624036751; bh=uZHMNHI9o+rXnoj5Twc+b/EgkHvhpnoWxJwexV6r8Q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=XQuor4ZXse3g5cVyv9YKwrdhQybz1rSd4HOTiaN/9U5XzoSBpROrKThjadOfnEWSV QFGkNRMCxmXJOgCz2qspYWG+LbUuD1cu4cMh67um+o6aY7XqEwadH4cMN0aFu+yCi5 CeDY6bJ3JEq3qkFVaGmMwyl7QEqVXPgvdwSDzKFt3b2ivKjLcISkVyzqpdXKb0IZh+ utCbcmLnjeHfutOGtBRZ801D+RfELWQvSxho41uqzFIdxTtECwfrvWgW/LrrX+YHAn 79H6+1IvwvGusfMMljm/s9D5BdXlMZieTHi/9mStgebmQRf8qgJ37ibnH44XF9Vkqq Ig/a3vzZGAZpg== 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: , Reply-To: 49025@debbugs.gnu.org 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=1624036866; h=from:from:sender:sender:reply-to: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=uZHMNHI9o+rXnoj5Twc+b/EgkHvhpnoWxJwexV6r8Q8=; b=d4Zdr5s25tCZ9MC0IDBbcCOFV//xh4/3Df5uj6GA2Jf4BLYUXHLiDAqI14cNX9Rm/3k0eu 97BunJwDKgKvVEP1N4kmNd8ejyHwffEszfeLueG1F0psrMoqtCfoYqARLXCciUL1kcFC/q zaNnMV9whMvaDd9bnoyYcqBx+VTJsPQPw3f63zlcmJQFj835wZl4f+sQPN1PGFK3hKHoIR XxS8c8gex7YEA4oMD/EYPOIHhDAKoTP/3mLSVXdJb2wBR6Ll1S+WKPlzsliDlNmLfPRCO0 hogGA4WwDocOzsQvED36WCTFKp8Vm0C+n0t/RH+a3fE1t4tHeTW/bYqKpsdOyA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624036866; a=rsa-sha256; cv=none; b=ahUJqb3/9FTslPXFdqPBYhQSBFiVVE0ZQiBV1oeSBL4m1vEYGyHw9ED9RaGXtic3KLMb44 oBSdscK7dMbtL31OEDCwJkdiRTO3F4vuXIwbmww5C4hF6K3if/G+VZRdh+221kvb6EENAH 0900TSAXTGvsOdz3cMXXnjiRIJgylqX2gOoSoHzqwAUmfftbNbjHb/B81M+1BYEiDufl4d aLvNlTY3vgZDS9nUvH5R194e+J46La4neeP7LZwPLdtklC3yLqpM7YAtpvGRKB5lkm8m+9 syo9tErlhd5k9vpmJD8ukQ7qiZ3gt1lhbWtsm0xP3YxwJnZ7BvdEDaNhBJq9Jg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=XQuor4ZX; 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: 1.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=XQuor4ZX; 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: A9EC6136D9 X-Spam-Score: 1.17 X-Migadu-Scanner: scn1.migadu.com X-TUID: T6pePl0O2+rP 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>: Eliminte %outputs and %build-inputs. --- gnu/packages/python.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9628836567..fbad0b65b8 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. ;;; @@ -575,8 +576,8 @@ 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/"))) + (let ((bin (string-append #$output "/bin")) + (python #$(file-append (this-package-input "python") "/bin/"))) (mkdir-p bin) (for-each (lambda (old new) @@ -586,8 +587,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