TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: libgcrypt: Provide absolute gpgrt-config also for native builds.

Browse source 
This fixes a regression since 497080c10e 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.
This commit is contained in:
Marius Bakke 2022-09-16 19:21:01 +02:00
parent 7e0f2728a4
commit 887e83997e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/gnupg.scm
View file

@ -178,18 +178,18 @@ (define-public libgcrypt
`(#: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/")