[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50201] [PATCH 25/52] gnu: heimdal: Refer to cross-compiled bash.
From: |
Maxime Devos |
Subject: |
[bug#50201] [PATCH 25/52] gnu: heimdal: Refer to cross-compiled bash. |
Date: |
Wed, 25 Aug 2021 20:03:05 +0200 |
* gnu/packages/kerberos.scm
(heimdal)[arguments]<#:phases>{pre-configure}: Let "appl/afsutil/pagsh.c"
refer to the cross-compiled bash instead of the native bash when
cross-compiling.
---
gnu/packages/kerberos.scm | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index 54dd5dffc1..9afc6a363f 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -231,11 +231,24 @@ After installation, the system administrator should
generate keys using
'()))
#:phases (modify-phases %standard-phases
(add-before 'configure 'pre-configure
- (lambda _
- (substitute* '("appl/afsutil/pagsh.c"
- "tools/Makefile.in")
- (("/bin/sh") (which "sh")))
- #t))
+ ;; TODO(core-updates): Unconditionally use the
+ ;; %current-target-system branch.
+ (,(if (%current-target-system)
+ 'lambda*
+ 'lambda)
+ ,(if (%current-target-system)
+ '(#:key inputs #:allow-other-keys)
+ '_)
+ ,@(if (%current-target-system)
+ '((substitute* '("appl/afsutil/pagsh.c")
+ (("/bin/sh")
+ (search-input-file inputs "bin/sh")))
+ (substitute* '("tools/Makefile.in")
+ (("/bin/sh") (which "sh"))))
+ '((substitute* '("appl/afsutil/pagsh.c"
+ "tools/Makefile.in")
+ (("/bin/sh") (which "sh")))
+ #t))))
(add-before 'check 'pre-check
(lambda _
;; For 'getxxyyy-test'.
--
2.33.0
- [bug#50201] [PATCH 22/52] gnu: iso-codes: Move inputs to native-inputs when cross-compiling., (continued)
- [bug#50201] [PATCH 14/52] gnu: gobject-introspection: Don't build introspection data when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 19/52] gnu: graphene: Don't build introspection data when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 23/52] gnu: heimdal: Fix inputs when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 05/52] gnu: perl: Find 'bash' when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 13/52] gnu: polkit: Prevent cross-compilation build error., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 18/52] gnu: bdb: Fix cross-compilation build errors., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 25/52] gnu: heimdal: Refer to cross-compiled bash.,
Maxime Devos <=
- [bug#50201] [PATCH 16/52] gobject-introspection: Correct library name when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 11/52] build-system/glib-or-gtk: Support cross-compilaton., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 15/52] gobject-introspection: Fix inputs when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 21/52] gnu: gamin: Fix 'configure' script when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 24/52] gnu: heimdal: Fix linking error when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 28/52] gnu: heimdal: Use libcom_err from input when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 26/52] gnu: heimdal: Use the cross-compiled bash in "su"., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 27/52] gnu: heimdal: Find tools when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 30/52] gnu: json-glib: Find docbook inputs when cross-compiling., Maxime Devos, 2021/08/25