From patchwork Fri Jun 18 16:09:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30391 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 12BD927BC83; Fri, 18 Jun 2021 17:15:39 +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 AF38D27BC81 for ; Fri, 18 Jun 2021 17:15:38 +0100 (BST) Received: from localhost ([::1]:49978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luH9d-0000et-KI for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 12:15:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5N-0000af-EY for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46309) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5N-0002CK-6Y for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5N-00030h-32 for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 core-updates] 33/37] tk: Do not use %build-inputs when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 16:11:13 +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.162403264811308 (code B ref 49025); Fri, 18 Jun 2021 16:11:13 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:48 +0000 Received: from localhost ([127.0.0.1]:57817 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4y-0002wD-1X for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:48 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4c-0002r7-Mf for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:28 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gASQB; Fri, 18 Jun 2021 18:10:26 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:32 +0200 Message-Id: <20210618160936.18972-33-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=1624032626; bh=zt7BAM2kxTcKP2NYK6l7VYfWxdJEaUVC9x+20Op9hjE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=Jp/4guZL1awaU08kdCY/i2LtdPvUfTTnfJTNfLc6sBQTsw0ApiFwS7Blx0J2DBdM4 TMBeXbTPHvIkw4234Yg0fq1ba/KqAng/bIqz6sAQpUAw12C+hq7HtfYhKdpwt8B4NC c9n51YySSpr0Rgyp2zgBz43SlfcTEUdH4H8JR3FaASHj3mIdEMCc6yjOISvVR3W/ln 1PkyW22nKbd2Jig0l4SBdQFjCgbPZT4mZjvQ+pApHSFu8mqHBrRKbyZaV/fWs3p41Y BzQzXwQ2gKBS6ApP9gb31i5dAwbjoPiKWWUOimmsmaOHDQDndJsKdg24AkV41jQLCX QPI+9155MUaRw== 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 %build-inputs does not exists when cross-compiling, so use #$(this-package-input ...) instead. * gnu/packages/tcl.scm (tk)[arguments]<#:configure-flags>: Use 'this-package-input' instead of '%build-inputs' when cross-compiling. --- gnu/packages/tcl.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index c87a8187f2..91ba8bbb3f 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -29,6 +29,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) @@ -232,7 +233,9 @@ X11 GUIs.") #:configure-flags ,#~ (list (string-append "--with-tcl=" - (assoc-ref %build-inputs "tcl") + #$(if (%current-target-system) + (this-package-input "tcl") + #~(assoc-ref %build-inputs "tcl")) "/lib") ;; This is needed when cross-compiling, see: ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719247