Re: [PATCH 4/5] gnu: openssl: Fixed cross-compile issues.

[ludo@gnu.org (Ludovic Courtès)]

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

> *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.

(ChangeLog format and line length.)

> --- 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)))

OK.

> @@ -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")))

This can’t possibly work.  It should be like:

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

(Alternately, the ‘patch-tests’ could be skipped when cross-compiling
since we won’t run the tests.)

Ludo’.