futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: libgcrypt: Update to 1.10.1.

Browse Source 
* gnu/packages/gnupg.scm (libgcrypt): Update to 1.10.1.
[arguments]: Add "ac_cv_path_GPGRT_CONFIG" when cross-compiling.
This commit is contained in:
Marius Bakke 2022-06-26 17:43:43 +02:00
parent b3efda914e
commit 497080c10e
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/gnupg.scm
View File

@ -14,7 +14,7 @@
;;; Copyright © 2017, 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@posteo.net> ;;; Copyright © 2020 Fredrik Salomonsson <plattfot@posteo.net>
@ -157,14 +157,14 @@ Daemon and possibly more in the future.")
(define-public libgcrypt (define-public libgcrypt
(package (package
(name "libgcrypt") (name "libgcrypt")
(version "1.8.8") (version "1.10.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1xasrh9zxhgj2n5n8dvpzbwn1mzpmlzy270xhbq2gl8xk2xy4pc9")))) "1pp9zyx02bzgzjzldxf0mx9kp3530xgaaqcz4n2cv100ddaaw57g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("libgpg-error-host" ,libgpg-error))) `(("libgpg-error-host" ,libgpg-error)))
@ -176,10 +176,20 @@ Daemon and possibly more in the future.")
;; 'configure' uses 'gpg-error-config' to determine the '-L' flag, and ;; 'configure' uses 'gpg-error-config' to determine the '-L' flag, and
;; the 'gpg-error-config' it runs is the native one---i.e., the wrong one. ;; the 'gpg-error-config' it runs is the native one---i.e., the wrong one.
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-gpg-error-prefix=" (list (string-append "--with-libgpg-error-prefix="
(assoc-ref %build-inputs "libgpg-error-host")) (assoc-ref %build-inputs "libgpg-error-host"))
;; When cross-compiling, _gcry_mpih_lshift etc are undefined ,@(if (%current-target-system)
,@(if (%current-target-system) '("--disable-asm") ;; When cross-compiling, _gcry_mpih_lshift etc are undefined.
`("--disable-asm"
;; libgcrypt is transitioning from gpg-error-config to
;; gpgrt-config, and in the process the
;; --with-libgpg-error-config prefix defined above is
;; not respected. See <https://dev.gnupg.org/T5365>.
;; TODO: transition to pkg-config instead of these scripts.
(string-append "ac_cv_path_GPGRT_CONFIG="
(assoc-ref %build-inputs
"libgpg-error-host")
"/bin/gpgrt-config"))
'())))) '()))))
(outputs '("out" "debug")) (outputs '("out" "debug"))
(home-page "https://gnupg.org/") (home-page "https://gnupg.org/")