From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: [PATCH 2/5] gnu: gnupg: Fixed cross-compile issues. Date: Sat, 14 Dec 2013 18:43:19 +0100 Message-ID: <1387043002-6138-2-git-send-email-john@darrington.wattle.id.au> References: <1387043002-6138-1-git-send-email-john@darrington.wattle.id.au> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrtFa-0005Gq-M3 for guix-devel@gnu.org; Sat, 14 Dec 2013 12:43:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VrtFU-0008CF-01 for guix-devel@gnu.org; Sat, 14 Dec 2013 12:43:38 -0500 Received: from de.cellform.com ([88.217.224.109]:34092 helo=jocasta.intra) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrtFT-0008C1-It for guix-devel@gnu.org; Sat, 14 Dec 2013 12:43:31 -0500 In-Reply-To: <1387043002-6138-1-git-send-email-john@darrington.wattle.id.au> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org *gnu/packages/gnupg.scm (libgpg-error): Added gcc as a native input, and set the CC_FOR_BUILD variable. *gnu/packages/gnupg.scm (libgcrypt): Added libgpg-error as a native input and set the --with-gpg-error-prefix configure option. *gnu/packages/gnupg.scm (libksba): Added libgpg-error as a native input and set the --with-gpg-error-prefix configure option. --- gnu/packages/gnupg.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index e888109..8d26688 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -44,6 +44,12 @@ (base32 "0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a")))) (build-system gnu-build-system) + (native-inputs + `(("gcc" ,gcc-final))) + (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 +74,12 @@ Daemon and possibly more in the future.") (build-system gnu-build-system) (propagated-inputs `(("libgpg-error" ,libgpg-error))) + (native-inputs + `(("libgpg-error" ,libgpg-error))) + (arguments + `(#: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 +130,14 @@ 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") -- 1.7.10.4