me/guix
Archived
1
0
Fork 0
Code Activity

gnu: heimdal: Find tools when cross-compiling.

Browse source 
* gnu/packages/kerberos.scm
  (heimdal)[arguments]<#:configure-flags>: Set --with-cross-tools.
  (heimdal)[arguments]<#:phases>{pre-configure}: Override
  ac_cv_PROG_COMPILE_ET.
This commit is contained in:
Maxime Devos 2021-08-25 10:29:25 +02:00 • committed by Mathieu Othacehe
parent 0bff68e44d
commit 784865adfe
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 32 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
gnu/packages/kerberos.scm
View file

@ -50,6 +50,7 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu))
@ -207,28 +208,33 @@ After installation, the system administrator should generate keys using
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list `(#:configure-flags
;; Avoid 7 MiB of .a files. ,#~(list
"--disable-static" ;; Avoid 7 MiB of .a files.
"--disable-static"
;; Do not build libedit. ;; Do not build libedit.
(string-append (string-append
"--with-readline-lib=" "--with-readline-lib="
(assoc-ref %build-inputs "readline") "/lib") (assoc-ref %build-inputs "readline") "/lib")
(string-append (string-append
"--with-readline-include=" "--with-readline-include="
(assoc-ref %build-inputs "readline") "/include") (assoc-ref %build-inputs "readline") "/include")
;; Do not build sqlite. ;; Do not build sqlite.
(string-append (string-append
"--with-sqlite3=" "--with-sqlite3="
(assoc-ref %build-inputs "sqlite")) (assoc-ref %build-inputs "sqlite"))
;; The configure script is too pessimistic. #$@(if (%current-target-system)
;; Setting this also resolves a linking error. ;; The configure script is too pessimistic.
,@(if (%current-target-system) ;; Setting this also resolves a linking error.
'("ac_cv_func_getpwnam_r_posix=yes") #~("ac_cv_func_getpwnam_r_posix=yes"
'())) ;; Allow 'slc' and 'asn1_compile' to be found.
(string-append "--with-cross-tools="
#+(file-append this-package
"/libexec/heimdal")))
#~()))
#: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 ;; TODO(core-updates): Unconditionally use the
@ -239,6 +245,13 @@ After installation, the system administrator should generate keys using
,(if (%current-target-system) ,(if (%current-target-system)
'(#:key inputs #:allow-other-keys) '(#:key inputs #:allow-other-keys)
'_) '_)
,@(if (%current-target-system)
`((substitute* "configure"
;; 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) ,@(if (%current-target-system)
'((substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") '((substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c")
(("/bin/sh") (("/bin/sh")