[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [PATCH v4 core-updates 21/36] openssl: Find bin/env when cro
From: |
Maxime Devos |
Subject: |
[bug#49025] [PATCH v4 core-updates 21/36] openssl: Find bin/env when cross-compiling. |
Date: |
Sat, 19 Jun 2021 17:04:43 +0200 |
%build-inputs does not exist when cross-compiling,
so find bin/env by another way.
* (openssl)[arguments]<#:phases>{configure}: Don't use '%build-inputs',
use 'which' instead.
---
gnu/packages/tls.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index dc9147c1e1..72a1cd8f0c 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -373,10 +373,10 @@ required structures.")
(let* ((out #$output)
(lib (string-append out "/lib")))
;; It's not a shebang so patch-source-shebangs misses it.
+ ;; Don't use (assoc-ref %build-inputs "coreutils"), as
+ ;; %build-inputs is not defined when cross-compiling.
(substitute* "config"
- (("/usr/bin/env")
- (string-append (assoc-ref %build-inputs "coreutils")
- "/bin/env")))
+ (("/usr/bin/env") (which "env")))
(invoke #$@(if (%current-target-system)
#~("./Configure")
#~("./config"))
--
2.32.0
- [bug#49025] [PATCH v4 core-updates 27/36] fontconfig: Make the #:configure-flags argument a G-expression., (continued)
- [bug#49025] [PATCH v4 core-updates 27/36] fontconfig: Make the #:configure-flags argument a G-expression., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 31/36] glib: Look up "tzdata" in 'native-inputs', not 'inputs'., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 22/36] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 36/36] meson: Support cross-compilation., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 12/36] libgcrypt: Fix cross-compilation build error., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 15/36] python: Fix reference to input when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 16/36] openssl: Remove trailing #t from phases., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 18/36] openssl: Use G-exp machinery for referring to outputs., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 20/36] openssl: Move all man pages to separate output, not only man3., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 09/36] libgpg-error: Prevent silent miscompilation some systems., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 21/36] openssl: Find bin/env when cross-compiling.,
Maxime Devos <=
- [bug#49025] [PATCH v4 core-updates 35/36] cross-base: Fix cross-compiler for i686-linux-gnu., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 33/36] tk: Do not use %build-inputs when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 26/36] bash: Fix cross-compilation build error., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 34/36] libelf: Use the cross-compiler when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 25/36] bash: Make #:configure-flags a G-expression., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 32/36] tk: Make #:configure-flags a G-expression., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 23/36] readline: Make #:configure-flags a G-expression., Maxime Devos, 2021/06/19