me
/
guix
Archived
1
0
Fork 0
Code

gnu: curl: Build against MIT Kerberos instead of GSS. 

* gnu/packages/curl.scm (curl)[inputs]: Change from GSS to MIT-KRB5.
[arguments]: Adjust accordingly.
master
Marius Bakke 2019-02-23 17:16:25 +01:00
parent fd6983d10f
commit 828d3765a7
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/curl.scm
View File

@ -37,8 +37,8 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages groff) #:use-module (gnu packages groff)
#:use-module (gnu packages gsasl)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages libidn) #:use-module (gnu packages libidn)
#:use-module (gnu packages openldap) #:use-module (gnu packages openldap)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
@ -63,7 +63,6 @@
(outputs '("out" (outputs '("out"
"doc")) ;1.2 MiB of man3 pages "doc")) ;1.2 MiB of man3 pages
(inputs `(("gnutls" ,gnutls) (inputs `(("gnutls" ,gnutls)
("gss" ,gss)
("libidn" ,libidn) ("libidn" ,libidn)
;; TODO XXX <https://bugs.gnu.org/34927> ;; TODO XXX <https://bugs.gnu.org/34927>
;; Curl doesn't actually use or refer to libssh2 because the build ;; Curl doesn't actually use or refer to libssh2 because the build
@ -71,6 +70,7 @@
;; a mass rebuild is appropriate (e.g. core-updates). ;; a mass rebuild is appropriate (e.g. core-updates).
("libssh2" ,libssh2-1.8.0) ("libssh2" ,libssh2-1.8.0)
("openldap" ,openldap) ("openldap" ,openldap)
("mit-krb5" ,mit-krb5)
("nghttp2" ,nghttp2 "lib") ("nghttp2" ,nghttp2 "lib")
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
@ -89,8 +89,10 @@
(separator #f) ;single entry (separator #f) ;single entry
(files '("etc/ssl/certs/ca-certificates.crt"))))) (files '("etc/ssl/certs/ca-certificates.crt")))))
(arguments (arguments
`(#:configure-flags '("--with-gnutls" "--with-gssapi" `(#:configure-flags (list "--with-gnutls"
"--disable-static") (string-append "--with-gssapi="
(assoc-ref %build-inputs "mit-krb5"))
"--disable-static")
;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases