From patchwork Fri Jun 18 16:09:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30409 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 33EEA27BC78; Fri, 18 Jun 2021 17:17:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 681EA27BC81 for ; Fri, 18 Jun 2021 17:17:54 +0100 (BST) Received: from localhost ([::1]:57728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luHBp-0005wY-H1 for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 12:17:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH6A-0002Mi-BQ for guix-patches@gnu.org; Fri, 18 Jun 2021 12:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46320) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH69-0002ml-TN for guix-patches@gnu.org; Fri, 18 Jun 2021 12:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH69-00032p-PS for guix-patches@gnu.org; Fri, 18 Jun 2021 12:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 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 16:12:01 +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.162403267711645 (code B ref 49025); Fri, 18 Jun 2021 16:12:01 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:11:17 +0000 Received: from localhost ([127.0.0.1]:57864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH5Q-00031j-UX for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:11:17 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4V-0002ql-7N for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:34 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAJN9; Fri, 18 Jun 2021 18:10:18 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:13 +0200 Message-Id: <20210618160936.18972-14-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618160936.18972-1-maximedevos@telenet.be> References: <20210618160936.18972-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624032618; bh=uZHMNHI9o+rXnoj5Twc+b/EgkHvhpnoWxJwexV6r8Q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=OCkHjRUz9jyrrTaFHyEJTwzuK5tn+mx40U+Kez7Z1xRq/J8CtiPcEe0zWU2R06Yc3 vGZ58ZGLUaUUgmy4gJr9I8xiQJoKyOG6DULq+1yNY4ffXB1Xpq231MIvVrFeYFeveL rb1wmUahhKgvM8PgOij5ITFvvc16c4xlBYVA+TiW6WSam0ZYUSfr+xugaFXj2WCoin dR8WV9gs2vrdylrfsCZlz7c4vumYgotqeUWT/OzxZB0jWbLZfAptzAOqLfdGS6bjdP Hkm3Yb6J2LsXqXXWhHJKsjVako6Sfi1ph4Mglt9fzIBzO2p+I+alW/ufrg/5jyYq2A um5iwyBL5yUeA== 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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