[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/142: gnu: heimdal: Unify phases, addressing TODO.
From: |
guix-commits |
Subject: |
23/142: gnu: heimdal: Unify phases, addressing TODO. |
Date: |
Mon, 10 Jan 2022 13:07:15 -0500 (EST) |
apteryx pushed a commit to branch version-1.4.0
in repository guix.
commit cbb6f14ab317bc3f7fb6322590c9b545f744ba34
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Dec 17 16:16:53 2021 -0500
gnu: heimdal: Unify phases, addressing TODO.
* gnu/packages/kerberos.scm (heimdal)[phases]: Unconditionally use the
%current-target-system branch.
---
gnu/packages/kerberos.scm | 55 ++++++++++++++++++-----------------------------
1 file changed, 21 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index 717d43190c..dec09ca791 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -216,40 +216,27 @@ 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)
- '_)
- ,@(if (%current-target-system)
- `((substitute* "configure"
- ;; The e2fsprogs input is included for
libcom_err,
- ;; let's use it even if cross-compiling.
- (("test \"\\$\\{krb_cv_com_err\\}\" = \"yes\"")
- ":")
- ;; Our 'compile_et' is not in
--with-cross-tools,
- ;; which confuses heimdal.
-
(("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")))))))
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "configure"
+ ;; The e2fsprogs input is included for libcom_err,
+ ;; let's use it even if cross-compiling.
+ (("test \"\\$\\{krb_cv_com_err\\}\" = \"yes\"")
+ ":")
+ ;; Our 'compile_et' is not in --with-cross-tools,
+ ;; which confuses heimdal.
+
(("ac_cv_prog_COMPILE_ET=\\$\\{with_cross_tools\\}compile_et")
+ "ac_cv_PROG_COMPILE_ET=compile_et"))
+ (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'.
- 09/142: gnu: meson: Update to 0.60.2 and absorb meson-wrapped., (continued)
- 09/142: gnu: meson: Update to 0.60.2 and absorb meson-wrapped., guix-commits, 2022/01/10
- 10/142: gnu: Remove meson-0.59 workarounds., guix-commits, 2022/01/10
- 02/142: gnu: libx11: Update to 1.7.3.1., guix-commits, 2022/01/10
- 08/142: gnu: python-flit-core: Update to 3.5.1., guix-commits, 2022/01/10
- 03/142: gnu: mesa: Update to 21.3.2., guix-commits, 2022/01/10
- 16/142: gnu: binutils: Absorb binutils-next., guix-commits, 2022/01/10
- 31/142: gnu: glibmm-2.64: Fix libsigc++ propagation., guix-commits, 2022/01/10
- 19/142: gnu: gobject-introspection: Unconditionally use flex and bison., guix-commits, 2022/01/10
- 14/142: gnu: autoconf-2.69: Repatriate unpatch-shebangs phase from 2.71., guix-commits, 2022/01/10
- 20/142: gnu: mozjs-60: Use quasiquote, addressing TODO., guix-commits, 2022/01/10
- 23/142: gnu: heimdal: Unify phases, addressing TODO.,
guix-commits <=
- 36/142: gnu: libpcap: Update to 2.62., guix-commits, 2022/01/10
- 57/142: gnu: python-typed-ast: Update to 1.5.1., guix-commits, 2022/01/10
- 61/142: gnu: python-typing: Update to 3.10.0.0., guix-commits, 2022/01/10
- 28/142: gnu: help2man: Update to 1.48.5., guix-commits, 2022/01/10
- 13/142: gnu: avahi: Make all arguments unconditional., guix-commits, 2022/01/10
- 12/142: gnu: python-3.9: Update to 3.9.9., guix-commits, 2022/01/10
- 21/142: gnu: llvm-12: Use quasiquote, addressing TODO., guix-commits, 2022/01/10
- 18/142: gnu: rust-bitflags-1: Absorb rust-bitflags-1.3., guix-commits, 2022/01/10
- 29/142: gnu: pciutils: Fix the conditional for the kmod input., guix-commits, 2022/01/10
- 32/142: gnu: gnupg: Update to 2.2.32., guix-commits, 2022/01/10