mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-20 06:37:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: rhash: Fix cross-compilation.

Browse source 
* gnu/packages/crypto.scm (rhash)[arguments]: In custom configure phase,
set "--target" and "-cc" when cross-compiling.
This commit is contained in:
Marius Bakke 2020-01-26 13:04:13 +01:00
parent 4d67659700
commit a51c9c903f
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/crypto.scm
View file

@ -14,6 +14,7 @@
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -728,9 +729,16 @@ (define-public rhash
(replace 'configure (replace 'configure
;; ./configure is not GNU autotools' and doesn't gracefully handle ;; ./configure is not GNU autotools' and doesn't gracefully handle
;; unrecognized options, so we must call it manually. ;; unrecognized options, so we must call it manually.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key native-inputs outputs #:allow-other-keys)
(invoke "./configure" (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 (add-before 'check 'patch-/bin/sh
(lambda _ (lambda _
(substitute* "Makefile" (substitute* "Makefile"