[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/09: gnu: rhash: Fix cross-compilation.
From: |
guix-commits |
Subject: |
08/09: gnu: rhash: Fix cross-compilation. |
Date: |
Sun, 26 Jan 2020 07:46:14 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit a51c9c903f9db26a08672c7e19ddddeef1aee6b4
Author: Marius Bakke <address@hidden>
AuthorDate: Sun Jan 26 13:04:13 2020 +0100
gnu: rhash: Fix cross-compilation.
* gnu/packages/crypto.scm (rhash)[arguments]: In custom configure phase,
set "--target" and "-cc" when cross-compiling.
---
gnu/packages/crypto.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 4e761de..7947284 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2018 Tim Gesthuizen <address@hidden>
;;; Copyright © 2019 Pierre Neidhardt <address@hidden>
;;; Copyright © 2019 Tanguy Le Carrour <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -728,9 +729,16 @@ BLAKE.")
(replace 'configure
;; ./configure is not GNU autotools' and doesn't gracefully handle
;; unrecognized options, so we must call it manually.
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda* (#:key native-inputs outputs #:allow-other-keys)
(invoke "./configure"
- (string-append "--prefix=" (assoc-ref outputs "out")))))
+ (string-append "--prefix=" (assoc-ref outputs "out"))
+ ,@(let ((target (%current-target-system)))
+ (if target
+ `((string-append "--target=" ,target)
+ (string-append "--cc="
+ (assoc-ref native-inputs
"cross-gcc")
+ "/bin/" ,target "-gcc"))
+ '())))))
(add-before 'check 'patch-/bin/sh
(lambda _
(substitute* "Makefile"
- branch core-updates updated (ed24dda -> ac84175), guix-commits, 2020/01/26
- 03/09: gnu: cmake: Remove bundled LibUV., guix-commits, 2020/01/26
- 01/09: build-system/cmake: Enable parallel tests by default., guix-commits, 2020/01/26
- 05/09: gnu: libjpeg-turbo: Fix cross-compilation., guix-commits, 2020/01/26
- 02/09: gnu: cmake, cmake-minimal: Use cmake-build-system., guix-commits, 2020/01/26
- 07/09: gnu: jsoncpp: Fix cross-compilation., guix-commits, 2020/01/26
- 06/09: build-system/cmake: Specify C++ compiler when cross-compiling., guix-commits, 2020/01/26
- 09/09: gnu: cmake: Fix cross-compilation., guix-commits, 2020/01/26
- 04/09: gnu: cmake: Enable debugging information., guix-commits, 2020/01/26
- 08/09: gnu: rhash: Fix cross-compilation.,
guix-commits <=