[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [PATCH v3 core-updates 33/37] tk: Do not use %build-inputs w
From: |
Maxime Devos |
Subject: |
[bug#49025] [PATCH v3 core-updates 33/37] tk: Do not use %build-inputs when cross-compiling. |
Date: |
Fri, 18 Jun 2021 19:16:27 +0200 |
%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
--
2.32.0
- [bug#49025] [PATCH v3 core-updates 25/37] bash: Make #:configure-flags a G-expression., (continued)
- [bug#49025] [PATCH v3 core-updates 25/37] bash: Make #:configure-flags a G-expression., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 32/37] tk: Make #:configure-flags a G-expression., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 34/37] libelf: Use the cross-compiler when cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 31/37] glib: Look up "tzdata" in 'native-inputs', not 'inputs'., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 37/37] meson: Support cross-compilation., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 36/37] cross-base: Fix cross-compiler for i686-linux-gnu., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 24/37] readline: Fix build error when cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 35/37] opendht: Correct 'nettle' variable name in inputs., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 13/37] wrap-python3: Make #:builder a G-exp instead of a raw S-exp., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 33/37] tk: Do not use %build-inputs when cross-compiling.,
Maxime Devos <=
- [bug#49025] [PATCH v4 core-updates 00/36] Support cross-compilation with meson, Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 01/36] utils: Define target-linux? predicate., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 02/36] utils: Define a target-x86-32? and target-x86-64? predicate., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 05/36] net-base: Fix cross-compilation, eliminating %build-inputs & friends, Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 04/36] net-base: Make #:builder argument a G-expression., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 06/36] net-base: Don't cross-compile., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 03/36] packages: Define this-package-input and this-package-native-input., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 08/36] libgpg-error: Remove trailing #f from phases., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 07/36] tzdata: Don't bother with cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 10/36] libgpgerror: Maybe fix a cross-compilation bug., Maxime Devos, 2021/06/19