[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/52: gnu: heimdal: Use the cross-compiled bash in "su".
From: |
guix-commits |
Subject: |
26/52: gnu: heimdal: Use the cross-compiled bash in "su". |
Date: |
Mon, 20 Sep 2021 07:19:34 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit 0bff68e44d65493bad50b6c07e7c1cfc93846986
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 23:54:14 2021 +0200
gnu: heimdal: Use the cross-compiled bash in "su".
* gnu/packages/kerberos.scm
(heimdal)[arguments]<#:phases>{pre-configure}: Replace _PATH_BSHELL
with the cross-compiled bin/sh when cross-compiling.
---
gnu/packages/kerberos.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index 9afc6a3..126cdf4 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -240,9 +240,15 @@ After installation, the system administrator should
generate keys using
'(#:key inputs #:allow-other-keys)
'_)
,@(if (%current-target-system)
- '((substitute* '("appl/afsutil/pagsh.c")
+ '((substitute* '("appl/afsutil/pagsh.c"
"appl/su/su.c")
(("/bin/sh")
- (search-input-file inputs "bin/sh")))
+ (search-input-file inputs "bin/sh"))
+ ;; Use the cross-compiled bash instead of the
+ ;; native bash (XXX shouldn't _PATH_BSHELL point
+ ;; to a cross-compiled bash?).
+ (("_PATH_BSHELL")
+ (string-append
+ "\"" (search-input-file inputs "bin/sh")
"\"")))
(substitute* '("tools/Makefile.in")
(("/bin/sh") (which "sh"))))
'((substitute* '("appl/afsutil/pagsh.c"
- 27/52: gnu: heimdal: Find tools when cross-compiling., (continued)
- 27/52: gnu: heimdal: Find tools when cross-compiling., guix-commits, 2021/09/20
- 32/52: gnu: json-glib: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20
- 03/52: gnu: elogind: Fix cross-compilation., guix-commits, 2021/09/20
- 04/52: gnu: libcap: Fix cross-compilation build failures., guix-commits, 2021/09/20
- 05/52: gnu: perl: Find 'bash' when cross-compiling., guix-commits, 2021/09/20
- 08/52: gnu: mozjs-60: Fix cross-compilation build errors., guix-commits, 2021/09/20
- 10/52: build-system/meson: Allow 'configure-flags' to be a G-exp., guix-commits, 2021/09/20
- 22/52: gnu: iso-codes: Move inputs to native-inputs when cross-compiling., guix-commits, 2021/09/20
- 14/52: gnu: gobject-introspection: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20
- 20/52: gnu: gamin: Recognise aarch64 as architecture when cross-compiling., guix-commits, 2021/09/20
- 26/52: gnu: heimdal: Use the cross-compiled bash in "su".,
guix-commits <=
- 29/52: gnu: json-glib: Add missing 'bash-minimal' input., guix-commits, 2021/09/20
- 30/52: gnu: json-glib: Find docbook inputs when cross-compiling., guix-commits, 2021/09/20
- 31/52: gnu: json-glib: Don't build gtk documentation when cross-compiling., guix-commits, 2021/09/20
- 36/52: gnu: avahi: Use the cross-compiled bash., guix-commits, 2021/09/20
- 38/52: gnu: at-spi2-core: Find docbook when cross-compiling., guix-commits, 2021/09/20
- 44/52: gnu: libxxf85vm: Add --disable-malloc0-returnsnull when necessary., guix-commits, 2021/09/20
- 41/52: gnu: libxinerama: Add --disable-malloc0-returnsnull when necessary., guix-commits, 2021/09/20
- 43/52: gnu: libxrandr: Add --disable-malloc0-returnsnull when necessary., guix-commits, 2021/09/20
- 39/52: gnu: at-spi2-core: Add missing "bash-minimal" input., guix-commits, 2021/09/20
- 40/52: gnu: xorg: Unify --disable-malloc0-returnsnull code., guix-commits, 2021/09/20