From 497080c10ef154818795dd544fe4d606b1e8535d Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Sun, 26 Jun 2022 17:43:43 +0200
Subject: 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(-)

(limited to 'gnu/packages/gnupg.scm')

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 @@ (define (link triplet source)
 (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 @@ (define-public libgcrypt
      ;; '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/")
-- 
cgit v1.2.3