[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
33/38: gnu: heimdal: Make some parts of phases unconditional.
|
From: |
guix-commits |
|
Subject: |
33/38: gnu: heimdal: Make some parts of phases unconditional. |
|
Date: |
Sat, 2 Oct 2021 12:52:46 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 296599dac517bc154dd3a0743fc762f7719ff1ae
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Oct 1 16:21:35 2021 +0200
gnu: heimdal: Make some parts of phases unconditional.
* gnu/packages/kerberos.scm (heimdal)[arguments]<#:phases>{pre-configure}:
Make the '(%current-target-system)' branches unconditional.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/kerberos.scm | 36 ++++++++++++------------------------
1 file changed, 12 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index 82609ce..6bfb758 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -237,14 +237,7 @@ After installation, the system administrator should
generate keys using
#~()))
#:phases (modify-phases %standard-phases
(add-before 'configure 'pre-configure
- ;; 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)
- '_)
+ (lambda* (#:key inputs #:allow-other-keys)
,@(if (%current-target-system)
`((substitute* "configure"
;; The e2fsprogs input is included for
libcom_err,
@@ -256,22 +249,17 @@ After installation, the system administrator should
generate keys using
(("ac_cv_prog_COMPILE_ET=\\$\\{with_cross_tools\\}compile_et")
"ac_cv_PROG_COMPILE_ET=compile_et")))
'())
- ,@(if (%current-target-system)
- '((substitute* '("appl/afsutil/pagsh.c"
"appl/su/su.c")
- (("/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"
- "tools/Makefile.in")
- (("/bin/sh") (which "sh")))
- #t))))
+ (substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c")
+ (("/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")))))
(add-before 'check 'pre-check
(lambda _
;; For 'getxxyyy-test'.
- 22/38: gnu: gdk-pixbuf: Remove trailing #t., (continued)
- 22/38: gnu: gdk-pixbuf: Remove trailing #t., guix-commits, 2021/10/02
- 25/38: gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 12/38: gnu: gobject-introspection: Move things to native-inputs., guix-commits, 2021/10/02
- 19/38: gnu: gdk-pixbuf: Respect #:tests?., guix-commits, 2021/10/02
- 24/38: gnu: at-spi2-core: Respect #:tests?., guix-commits, 2021/10/02
- 32/38: gnu: json-glib: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 34/38: gnu: heimdal: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 38/38: lint: check-wrapper-inputs: Remove mentions of core-updates., guix-commits, 2021/10/02
- 37/38: build/qt-utils: Allow overriding the shell interpreter used., guix-commits, 2021/10/02
- 31/38: gnu: json-glib: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 33/38: gnu: heimdal: Make some parts of phases unconditional.,
guix-commits <=
- 35/38: gnu: libcap: Unconditionally use #$output., guix-commits, 2021/10/02
- 36/38: gnu: libproxy: Respect #:tests?., guix-commits, 2021/10/02