[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [PATCH v3 core-updates 21/37] openssl: Find bin/env when cro
From: |
Maxime Devos |
Subject: |
[bug#49025] [PATCH v3 core-updates 21/37] openssl: Find bin/env when cross-compiling. |
Date: |
Fri, 18 Jun 2021 19:16:15 +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 c178806805..a4e754e27f 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -376,10 +376,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 v3 core-updates 08/37] libgpg-error: Remove trailing #f from phases., (continued)
- [bug#49025] [PATCH v3 core-updates 08/37] libgpg-error: Remove trailing #f from phases., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 06/37] net-base: Don't cross-compile., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 11/37] libgpg-error: Fix cross-compilation error., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 10/37] libgpgerror: Maybe fix a cross-compilation bug., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 03/37] packages: Define this-package-input and this-package-native-input., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 14/37] wrap-python3: Fix cross-compilation., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 17/37] openssl: Make the #:phases argument a G-expression., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 18/37] openssl: Use G-exp machinery for referring to outputs., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 19/37] openssl: Move documentation instead of copying and deleting it., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 20/37] openssl: Move all man pages to separate output, not only man3., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 21/37] openssl: Find bin/env when cross-compiling.,
Maxime Devos <=
- [bug#49025] [PATCH v3 core-updates 22/37] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 23/37] readline: Make #:configure-flags a G-expression., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 16/37] openssl: Remove trailing #t from phases., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 27/37] fontconfig: Make the #:configure-flags argument a G-expression., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 30/37] glib: Verify the cross-compiled python is used in installed scripts., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 12/37] libgcrypt: Fix cross-compilation build error., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 09/37] libgpg-error: Prevent silent miscompilation some systems., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 15/37] python: Fix reference to input when cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 28/37] fontconfig: Fix build error when cross-compiling., Maxime Devos, 2021/06/18
- [bug#49025] [PATCH v3 core-updates 26/37] bash: Fix cross-compilation build error., Maxime Devos, 2021/06/18