aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Darrington <john@darrington.wattle.id.au>2013-12-15 09:39:05 +0100
committerLudovic Courtès <ludo@gnu.org>2013-12-15 22:31:18 +0100
commite766f699be12e5ad044c415a1b8658cfe0a18c9b (patch)
tree66c00ee19ad24cf37e102dbb36da4093b1464c7c
parent94e450812bc9ca5797645d1b256a5dc11a87f51a (diff)
downloadguix-e766f699be12e5ad044c415a1b8658cfe0a18c9b.tar
guix-e766f699be12e5ad044c415a1b8658cfe0a18c9b.tar.gz
gnu: gnupg: Fix cross-compile issues.
* gnu/packages/gnupg.scm (libgpg-error): Add gcc as a native input, and set the CC_FOR_BUILD variable. * gnu/packages/gnupg.scm (libgcrypt): Add libgpg-error as a native input and set the --with-gpg-error-prefix configure option. * gnu/packages/gnupg.scm (libksba): Add libgpg-error as a native input and set the --with-gpg-error-prefix configure option. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--gnu/packages/gnupg.scm23
1 files changed, 23 insertions, 0 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index e88810916e..34469a2bf7 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -44,6 +44,10 @@
(base32
"0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a"))))
(build-system gnu-build-system)
+ (arguments
+ (if (%current-target-system)
+ '(#:configure-flags '("CC_FOR_BUILD=gcc"))
+ '()))
(home-page "http://gnupg.org")
(synopsis
"Libgpg-error, a small library that defines common error values for all GnuPG components")
@@ -68,6 +72,16 @@ Daemon and possibly more in the future.")
(build-system gnu-build-system)
(propagated-inputs
`(("libgpg-error" ,libgpg-error)))
+ (native-inputs
+ ;; Needed here for the 'gpg-error' program.
+ `(("libgpg-error" ,libgpg-error)))
+ (arguments
+ ;; The '--with-gpg-error-prefix' argument is needed because otherwise
+ ;; '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="
+ (assoc-ref %build-inputs "libgpg-error")))))
(home-page "http://gnupg.org/")
(synopsis "Cryptographic function library")
(description
@@ -118,6 +132,15 @@ provided.")
(build-system gnu-build-system)
(propagated-inputs
`(("libgpg-error" ,libgpg-error)))
+ (native-inputs
+ `(("libgpg-error" ,libgpg-error)))
+ (arguments
+ `(#:configure-flags
+ (list ,@(if (%current-target-system)
+ '("CC_FOR_BUILD=gcc")
+ '())
+ (string-append "--with-gpg-error-prefix="
+ (assoc-ref %build-inputs "libgpg-error")))))
(home-page "http://www.gnupg.org")
(synopsis
"Libksba is a CMS and X.509 access library under development")