guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: John Darrington
Subject: [PATCH 4/5] gnu: openssl: Fixed cross-compile issues.
Date: Sat, 14 Dec 2013 18:43:21 +0100

*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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]