[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/19: gnu: libgcrypt: Update to 1.10.1.
From: |
guix-commits |
Subject: |
13/19: gnu: libgcrypt: Update to 1.10.1. |
Date: |
Sun, 26 Jun 2022 17:24:48 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 497080c10ef154818795dd544fe4d606b1e8535d
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Jun 26 17:43:43 2022 +0200
gnu: libgcrypt: Update to 1.10.1.
* gnu/packages/gnupg.scm (libgcrypt): Update to 1.10.1.
[arguments]: Add "ac_cv_path_GPGRT_CONFIG" when cross-compiling.
---
gnu/packages/gnupg.scm | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 701f8feb4a..15909713c3 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -14,7 +14,7 @@
;;; Copyright © 2017, 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; 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 © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@posteo.net>
@@ -157,14 +157,14 @@ Daemon and possibly more in the future.")
(define-public libgcrypt
(package
(name "libgcrypt")
- (version "1.8.8")
+ (version "1.10.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
version ".tar.bz2"))
(sha256
(base32
- "1xasrh9zxhgj2n5n8dvpzbwn1mzpmlzy270xhbq2gl8xk2xy4pc9"))))
+ "1pp9zyx02bzgzjzldxf0mx9kp3530xgaaqcz4n2cv100ddaaw57g"))))
(build-system gnu-build-system)
(propagated-inputs
`(("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
;; the 'gpg-error-config' it runs is the native one---i.e., the wrong one.
`(#:configure-flags
- (list (string-append "--with-gpg-error-prefix="
+ (list (string-append "--with-libgpg-error-prefix="
(assoc-ref %build-inputs "libgpg-error-host"))
- ;; When cross-compiling, _gcry_mpih_lshift etc are undefined
- ,@(if (%current-target-system) '("--disable-asm")
+ ,@(if (%current-target-system)
+ ;; 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"))
(home-page "https://gnupg.org/")
- branch core-updates updated (03e13c8981 -> ea53e292a8), guix-commits, 2022/06/26
- 03/19: gnu: isl: Update to 0.24., guix-commits, 2022/06/26
- 07/19: gnu: readline: Update to 8.1.2., guix-commits, 2022/06/26
- 04/19: gnu: binutils: Update to 2.38., guix-commits, 2022/06/26
- 12/19: gnu: libgpg-error: Update to 1.45., guix-commits, 2022/06/26
- 14/19: gnu: gdbm: Update to 1.23., guix-commits, 2022/06/26
- 13/19: gnu: libgcrypt: Update to 1.10.1.,
guix-commits <=
- 15/19: gnu: libbsd: Update to 0.11.6., guix-commits, 2022/06/26
- 05/19: gnu: gawk: Update to 5.1.1., guix-commits, 2022/06/26
- 08/19: gnu: readline: Remove input labels., guix-commits, 2022/06/26
- 11/19: gnu: bison: Update to 3.8.2., guix-commits, 2022/06/26
- 06/19: gnu: gawk: Use G-expressions and remove labels., guix-commits, 2022/06/26
- 16/19: gnu: GnuTLS: Update to 3.7.6., guix-commits, 2022/06/26
- 19/19: gnu: Tcl/Tk: Update to 8.6.12., guix-commits, 2022/06/26
- 09/19: gnu: util-linux: Update to 2.37.4., guix-commits, 2022/06/26
- 18/19: gnu: libgpg-error: Remove input label., guix-commits, 2022/06/26
- 02/19: gnu: Remove guile@3.0.7., guix-commits, 2022/06/26