Today I wasn't able to cross build because of a few wrong'uns.

[John Darrington]

>From ab356cd5fa6c30e4b378644b406d7c757a7da4d3 Mon Sep 17 00:00:00 2001
From: John Darrington <address@hidden>
Date: Sat, 15 Nov 2014 13:19:19 +0100
Subject: [PATCH] gnu: Fix cross-compilation issues with libgnupg and
 autotools

* gnu/packages/gnupg.scm (libgnupg): Distinguish between host and native
  libgpg-error dependency.

* gnu/packages/autotools.scm (autoconf,automake): Move inputs to native-inputs.
---
 gnu/packages/autotools.scm |    4 ++--
 gnu/packages/gnupg.scm     |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index db1db45..0094577 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -45,7 +45,7 @@
        (base32
         "113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"))))
     (build-system gnu-build-system)
-    (inputs
+    (native-inputs
      `(("perl" ,perl)
        ("m4" ,m4)))
     ;; XXX: testsuite: 209 and 279 failed. The latter is an impurity. It
@@ -172,7 +172,7 @@ exec ~a --no-auto-compile \"$0\" \"address@hidden"
              (patches
               (list (search-patch "automake-skip-amhello-tests.patch")))))
     (build-system gnu-build-system)
-    (inputs
+    (native-inputs
      `(("autoconf" ,(autoconf-wrapper))
        ("perl" ,perl)))
     (native-search-paths
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 68c68cc..001b90a 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -79,17 +79,17 @@ Daemon and possibly more in the future.")
                "0k2wi34qhp5hq71w1ab3kw1gfsx7xff79bvynqkxp35kls94826y"))))
     (build-system gnu-build-system)
     (propagated-inputs
-     `(("libgpg-error" ,libgpg-error)))
+     `(("libgpg-error-host" ,libgpg-error)))
     (native-inputs
      ;; Needed here for the 'gpg-error' program.
-     `(("libgpg-error" ,libgpg-error)))
+     `(("libgpg-error-native" ,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")))))
+                            (assoc-ref %build-inputs "libgpg-error-host")))))
     (outputs '("out" "debug"))
     (home-page "http://gnupg.org/";)
     (synopsis "Cryptographic function library")
-- 
1.7.10.4