amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libtool: Fix cross-compilation.

Browse source 
* gnu/packages/autotools.scm (libtool)[arguments]: Do not run tests and use
bash from native-inputs when cross-compiling.
This commit is contained in:
Pierre-Moana Levesque 2019-07-04 19:18:48 +02:00 • committed by Mathieu Othacehe
parent 06b2bc550f
commit 647cfcf681
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/autotools.scm
View file

@ -9,6 +9,7 @@
;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -354,21 +355,22 @@ Makefile, simplifying the entire process for the developer.")
;; XXX: There are test failures on mips64el-linux starting from 2.4.4: ;; XXX: There are test failures on mips64el-linux starting from 2.4.4:
;; <http://hydra.gnu.org/build/181662>. ;; <http://hydra.gnu.org/build/181662>.
#:tests? ,(not (string-prefix? "mips64" ;; Also, do not run tests when cross compiling
(or (%current-target-system) #:tests? ,(not (or (%current-target-system)
(string-prefix? "mips64"
(%current-system)))) (%current-system))))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs native-inputs #:allow-other-keys)
;; Run the test suite in parallel, if possible. ;; Run the test suite in parallel, if possible.
(setenv "TESTSUITEFLAGS" (setenv "TESTSUITEFLAGS"
(string-append (string-append
"-j" "-j"
(number->string (parallel-job-count)))) (number->string (parallel-job-count))))
;; Patch references to /bin/sh. ;; Patch references to /bin/sh.
(let ((bash (assoc-ref inputs "bash"))) (let ((bash (assoc-ref (or native-inputs inputs) "bash")))
(substitute* "tests/testsuite" (substitute* "tests/testsuite"
(("/bin/sh") (("/bin/sh")
(string-append bash "/bin/sh"))) (string-append bash "/bin/sh")))