mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-26 20:49:29 -05:00
gnu: guile-gcrypt: Refer to the right libgcrypt when cross-compiling.
Fixes a regression introduced in
5e163ba009
where (gcrypt package-config)
would end up referring to the native libgcrypt.so instead of the target
one.
* gnu/packages/gnupg.scm (guile-gcrypt)[arguments]: Reintroduce
'add-libgrypt-config' phase.
[native-inputs]: Remove LIBGCRYPT.
This commit is contained in:
parent
a04b0e454c
commit
c45a821a63
1 changed files with 13 additions and 3 deletions
|
@ -436,14 +436,24 @@ (define-public guile-gcrypt
|
||||||
(arguments
|
(arguments
|
||||||
;; Work around <https://bugs.gnu.org/20272> to achieve reproducible
|
;; Work around <https://bugs.gnu.org/20272> to achieve reproducible
|
||||||
;; builds.
|
;; builds.
|
||||||
'(#:parallel-build? #f))
|
'(#:parallel-build? #f
|
||||||
|
|
||||||
|
#:phases
|
||||||
|
(modify-phases %standard-phases
|
||||||
|
(add-before 'configure 'add-libgrypt-config
|
||||||
|
(lambda* (#:key inputs target #:allow-other-keys)
|
||||||
|
(when target
|
||||||
|
;; When cross-compiling, the bash script 'libgcrypt-config'
|
||||||
|
;; must be accessible during the configure phase.
|
||||||
|
(setenv "PATH"
|
||||||
|
(string-append (assoc-ref inputs "libgcrypt")
|
||||||
|
"/bin:" (getenv "PATH")))))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)
|
`(("pkg-config" ,pkg-config)
|
||||||
("autoconf" ,autoconf)
|
("autoconf" ,autoconf)
|
||||||
("automake" ,automake)
|
("automake" ,automake)
|
||||||
("texinfo" ,texinfo)
|
("texinfo" ,texinfo)
|
||||||
("guile" ,guile-3.0)
|
("guile" ,guile-3.0)))
|
||||||
("libgcrypt" ,libgcrypt))) ;for 'libgcrypt-config'
|
|
||||||
(inputs
|
(inputs
|
||||||
`(("guile" ,guile-3.0)
|
`(("guile" ,guile-3.0)
|
||||||
("libgcrypt" ,libgcrypt)))
|
("libgcrypt" ,libgcrypt)))
|
||||||
|
|
Loading…
Reference in a new issue