[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH v3 28/48] gnu: libtool: Fix cross-compilation.
From: |
Mathieu Othacehe |
Subject: |
[bug#36477] [PATCH v3 28/48] gnu: libtool: Fix cross-compilation. |
Date: |
Mon, 2 Sep 2019 17:33:13 +0200 |
From: Pierre-Moana Levesque <address@hidden>
* gnu/packages/autotools.scm (libtool)[arguments]: Do not run tests and use
bash from native-inputs when cross-compiling.
---
gnu/packages/autotools.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index ceb70dfee7..98f31f6bca 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2017, 2019 Efraim Flashner <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2019 Pierre-Moana Levesque <address@hidden>
;;;
;;; 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:
;; <http://hydra.gnu.org/build/181662>.
- #:tests? ,(not (string-prefix? "mips64"
- (or (%current-target-system)
+ ;; Also, do not run tests when cross compiling
+ #:tests? ,(not (or (%current-target-system)
+ (string-prefix? "mips64"
(%current-system))))
#:phases
(modify-phases %standard-phases
(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.
(setenv "TESTSUITEFLAGS"
(string-append
"-j"
(number->string (parallel-job-count))))
;; Patch references to /bin/sh.
- (let ((bash (assoc-ref inputs "bash")))
+ (let ((bash (assoc-ref (or native-inputs inputs) "bash")))
(substitute* "tests/testsuite"
(("/bin/sh")
(string-append bash "/bin/sh")))
--
2.20.1
- [bug#36477] [PATCH v3 15/48] gnu: boost: Fix cross-compilation., (continued)
- [bug#36477] [PATCH v3 15/48] gnu: boost: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 24/48] gnu: procps: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 23/48] gnu: make-linux-libre: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 22/48] gnu: git: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 30/48] packages: Set outputs field as thunked., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 29/48] gnu: texinfo-4: Fix cross compilation, Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 28/48] gnu: libtool: Fix cross-compilation.,
Mathieu Othacehe <=
- [bug#36477] [PATCH v3 32/48] gnu: crda: Fix cross-compilation, Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 33/48] gnu: guile-xcb: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 31/48] gnu: libnl: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 35/48] gnu: cmake: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 34/48] gnu: guile-wm: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 36/48] gnu: console-setup: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 26/48] gnu: guile-sqlite3: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 37/48] gnu: mdadm: Fix cross-compilation., Mathieu Othacehe, 2019/09/02
- [bug#36477] [PATCH v3 38/48] gnu: grub: Fix cross-compilation., Mathieu Othacehe, 2019/09/02