From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: [PATCH 4/5] gnu: openssl: Fixed cross-compile issues. Date: Sat, 14 Dec 2013 18:43:21 +0100 Message-ID: <1387043002-6138-4-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]:55782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrtFa-0005Gr-RL for guix-devel@gnu.org; Sat, 14 Dec 2013 12:43:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VrtFU-0008CL-3E for guix-devel@gnu.org; Sat, 14 Dec 2013 12:43:38 -0500 Received: from de.cellform.com ([88.217.224.109]:34093 helo=jocasta.intra) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrtFT-0008C3-Mz for guix-devel@gnu.org; Sat, 14 Dec 2013 12:43:32 -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/openssl.scm (openssl): Move perl from inputs to native-inputs. Replace reference to target bash with the native bash or target bash as appropriate. --- gnu/packages/openssl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/openssl.scm b/gnu/packages/openssl.scm index ca72aa8..bacdcc5 100644 --- a/gnu/packages/openssl.scm +++ b/gnu/packages/openssl.scm @@ -35,9 +35,9 @@ (sha256 (base32 "1gjy6a7d8nszi9wq8jdzx3cffn0nss23h3cw2ywlw4cb9v6v77ia")))) (build-system gnu-build-system) - (inputs `(("perl" ,perl))) + (native-inputs `(("perl" ,perl))) (arguments - '(#:parallel-build? #f + `(#:parallel-build? #f #:parallel-tests? #f #:test-target "test" #:phases @@ -52,8 +52,8 @@ (string-append "--prefix=" out))))) (alist-cons-before 'patch-source-shebangs 'patch-tests - (lambda* (#:key inputs #:allow-other-keys) - (let ((bash (assoc-ref inputs "bash"))) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((bash (assoc-ref ,@(if (%current-target-system) '(native-inputs) '(inputs)) "bash"))) (substitute* (find-files "test" ".*") (("/bin/sh") (string-append bash "/bin/bash")) -- 1.7.10.4