me
/
guix
Archived
1
0
Fork 0
Code

gnu: heimdal: Unify phases, addressing TODO. 

* gnu/packages/kerberos.scm (heimdal)[phases]: Unconditionally use the
%current-target-system branch.
master
Maxim Cournoyer 2021-12-17 16:16:53 -05:00
parent 771550b280
commit cbb6f14ab3
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/kerberos.scm
View File

@ -216,16 +216,8 @@ After installation, the system administrator should generate keys using
#~())) #~()))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'configure 'pre-configure (add-before 'configure 'pre-configure
;; TODO(core-updates): Unconditionally use the (lambda* (#:key inputs #:allow-other-keys)
;; %current-target-system branch. (substitute* "configure"
(,(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, ;; The e2fsprogs input is included for libcom_err,
;; let's use it even if cross-compiling. ;; let's use it even if cross-compiling.
(("test \"\\$\\{krb_cv_com_err\\}\" = \"yes\"") (("test \"\\$\\{krb_cv_com_err\\}\" = \"yes\"")
@ -233,10 +225,8 @@ After installation, the system administrator should generate keys using
;; Our 'compile_et' is not in --with-cross-tools, ;; Our 'compile_et' is not in --with-cross-tools,
;; which confuses heimdal. ;; which confuses heimdal.
(("ac_cv_prog_COMPILE_ET=\\$\\{with_cross_tools\\}compile_et") (("ac_cv_prog_COMPILE_ET=\\$\\{with_cross_tools\\}compile_et")
"ac_cv_PROG_COMPILE_ET=compile_et"))) "ac_cv_PROG_COMPILE_ET=compile_et"))
'()) (substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c")
,@(if (%current-target-system)
'((substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c")
(("/bin/sh") (("/bin/sh")
(search-input-file inputs "bin/sh")) (search-input-file inputs "bin/sh"))
;; Use the cross-compiled bash instead of the ;; Use the cross-compiled bash instead of the
@ -246,10 +236,7 @@ After installation, the system administrator should generate keys using
(string-append (string-append
"\"" (search-input-file inputs "bin/sh") "\""))) "\"" (search-input-file inputs "bin/sh") "\"")))
(substitute* '("tools/Makefile.in") (substitute* '("tools/Makefile.in")
(("/bin/sh") (which "sh")))) (("/bin/sh") (which "sh")))))
'((substitute* '("appl/afsutil/pagsh.c"
"tools/Makefile.in")
(("/bin/sh") (which "sh")))))))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
;; For 'getxxyyy-test'. ;; For 'getxxyyy-test'.