From patchwork Sat Jun 19 15:04:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30503 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 B137E27BC81; Sat, 19 Jun 2021 16:10:21 +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,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 7849127BC78 for ; Sat, 19 Jun 2021 16:10:21 +0100 (BST) Received: from localhost ([::1]:60490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucc0-0006j7-In for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:10:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081u-JZ for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48902) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY5-0007z6-44 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY4-0005hl-WE for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 33/36] 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: Sat, 19 Jun 2021 15:06:16 +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.162411516321684 (code B ref 49025); Sat, 19 Jun 2021 15:06:16 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:03 +0000 Received: from localhost ([127.0.0.1]:60410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXr-0005dU-66 for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:03 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:33582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX8-0005Xi-7g for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:21 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4G6fH1683PzMqny7 for <49025@debbugs.gnu.org>; Sat, 19 Jun 2021 17:05:17 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135HrS; Sat, 19 Jun 2021 17:05:17 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:55 +0200 Message-Id: <20210619150458.12057-34-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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115117; bh=zt7BAM2kxTcKP2NYK6l7VYfWxdJEaUVC9x+20Op9hjE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tnwL8PW7jtnxZROUzja+DuvitURIHZkbxo9IJqPJLm+oviQQw3ihAbx9KT7lF0awG b911qGpcjtOd+wueM7eviItSSwKn6NjXWDi1GsrIbCW+KhAEqkUKrt60mfi8qkew13 sICe8lrK0rkMiXen6iEB/HRiSAuooAzzO0pLXdsYHLWeyoaak91OOltK3AHore0YxE pjTmJpc7MqSk6Ltb6xEgvsze29p9ea1dBp7XsWA8Se/wSx9mDxRQbnIAkFctn8TIP0 Mp8H+eV595uNEPf9r/B5W6mxDyaD581de/GYqVUDXOm3W4UpJBG9jwjz7s5IvqAdzz 5zWWze65JezwQ== 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+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