guix-commits
[Top][All Lists]
Advanced

[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"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]