guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

25/52: gnu: heimdal: Refer to cross-compiled bash.


From: guix-commits
Subject: 25/52: gnu: heimdal: Refer to cross-compiled bash.
Date: Mon, 20 Sep 2021 07:19:33 -0400 (EDT)

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

commit 527455be35c33e25cc76805a6f879d85a3624339
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 22:29:56 2021 +0200

    gnu: heimdal: Refer to cross-compiled bash.
    
    * 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 54dd5df..9afc6a3 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'.



reply via email to

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