From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: [PATCH 4/5] gnu: openssl: Fixed cross-compile issues.
Date: Sat, 14 Dec 2013 18:57:59 +0100
Message-ID: <8761qruxg8.fsf@gnu.org>
References: <1387043002-6138-1-git-send-email-john@darrington.wattle.id.au>
	<1387043002-6138-4-git-send-email-john@darrington.wattle.id.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58581)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1VrtTb-0008T4-Ll
	for guix-devel@gnu.org; Sat, 14 Dec 2013 12:58:13 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1VrtTV-00040L-Dg
	for guix-devel@gnu.org; Sat, 14 Dec 2013 12:58:07 -0500
Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:52981)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1VrtTV-00040E-7G
	for guix-devel@gnu.org; Sat, 14 Dec 2013 12:58:01 -0500
In-Reply-To: <1387043002-6138-4-git-send-email-john@darrington.wattle.id.au>
	(John Darrington's message of "Sat, 14 Dec 2013 18:43:21 +0100")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=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: John Darrington <john@darrington.wattle.id.au>
Cc: guix-devel@gnu.org

John Darrington <john@darrington.wattle.id.au> skribis:

> *gnu/packages/openssl.scm (openssl): Move perl from inputs to native-inpu=
ts.
>  Replace reference to target bash with the native bash or target bash as =
appropriate.

(ChangeLog format and line length.)

> --- a/gnu/packages/openssl.scm
> +++ b/gnu/packages/openssl.scm
> @@ -35,9 +35,9 @@
>              (sha256 (base32
>                       "1gjy6a7d8nszi9wq8jdzx3cffn0nss23h3cw2ywlw4cb9v6v77=
ia"))))
>     (build-system gnu-build-system)
> -   (inputs `(("perl" ,perl)))
> +   (native-inputs `(("perl" ,perl)))

OK.

> @@ -52,8 +52,8 @@
>                       (string-append "--prefix=3D" 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")))

This can=E2=80=99t possibly work.  It should be like:

  (let ((bash (assoc-ref (or native-inputs inputs) "bash")))
    ...)

(Alternately, the =E2=80=98patch-tests=E2=80=99 could be skipped when cross=
-compiling
since we won=E2=80=99t run the tests.)

Ludo=E2=80=99.