[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/19: gnu: libgcrypt: Provide absolute gpgrt-config also for native bui
From: |
guix-commits |
Subject: |
01/19: gnu: libgcrypt: Provide absolute gpgrt-config also for native builds. |
Date: |
Fri, 16 Sep 2022 16:45:29 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 887e83997e4c3fdab20cd3d2aec6ae3e66850669
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Sep 16 19:21:01 2022 +0200
gnu: libgcrypt: Provide absolute gpgrt-config also for native builds.
This fixes a regression since 497080c10ef154818795dd544fe4d606b1e8535d that
would cause things like LIBGCRYPT-STATIC from (gnu packages cryptsetup) to
refer to the wrong libgpg-error.
* gnu/packages/gnupg.scm (libgcrypt)[arguments]: Add
"ac_cv_path_GPGRT_CONFIG"
to #:configure-flags, and remove the cross-compile stanza.
---
gnu/packages/gnupg.scm | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index e81c89f719..bd8a7876bc 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -178,18 +178,18 @@ Daemon and possibly more in the future.")
`(#:configure-flags
(list (string-append "--with-libgpg-error-prefix="
(assoc-ref %build-inputs "libgpg-error-host"))
+ ;; 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")
,@(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"))
+ `("--disable-asm")
'()))))
(outputs '("out" "debug"))
(home-page "https://gnupg.org/")
- branch core-updates updated (7e0f2728a4 -> 5339cb1161), guix-commits, 2022/09/16
- 01/19: gnu: libgcrypt: Provide absolute gpgrt-config also for native builds.,
guix-commits <=
- 05/19: gnu: python-mako: Update to 1.2.2., guix-commits, 2022/09/16
- 07/19: gnu: GnuPG: Update to 2.2.39., guix-commits, 2022/09/16
- 02/19: gnu: glibc-for-bootstrap: Remove obsolete patch., guix-commits, 2022/09/16
- 03/19: gnu: freeimage: Adjust for LibTIFF 4.4., guix-commits, 2022/09/16
- 04/19: gnu: fontforge: Update to 20220308., guix-commits, 2022/09/16
- 08/19: gnu: libpaper: Update to 2.0.0., guix-commits, 2022/09/16
- 09/19: gnu: cmake-minimal: Update to 3.24.2., guix-commits, 2022/09/16
- 15/19: gnu: libtiff: Fix CVE-2022-34526., guix-commits, 2022/09/16
- 17/19: gnu: Remove wayland-protocols-next., guix-commits, 2022/09/16
- 12/19: gnu: tevent: Update to 0.13.0., guix-commits, 2022/09/16