[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
25/31: gnu: libarchive: Fix cross-compilation.
From: |
guix-commits |
Subject: |
25/31: gnu: libarchive: Fix cross-compilation. |
Date: |
Mon, 8 Jul 2019 05:43:42 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 7c314eea3d68c7a28fa663370d858c69de5dc144
Author: Mathieu Othacehe <address@hidden>
Date: Fri Jul 5 17:46:34 2019 +0200
gnu: libarchive: Fix cross-compilation.
* gnu/packages/backup.scm (libarchive)[arguments]: Do not build and run
tests
when cross-compiling.
---
gnu/packages/backup.scm | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 0bd894f..783ca7a 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2018 Oleg Pykhalov <address@hidden>
;;; Copyright © 2018, 2019 Ricardo Wurmus <address@hidden>
;;; Copyright © 2019 Alex Vong <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -226,17 +227,25 @@ backups (called chunks) to allow easy burning to CD/DVD.")
(("/bin/pwd") (which "pwd")))
#t))
(replace 'check
- (lambda _
- ;; XXX: The test_owner_parse, test_read_disk, and
- ;; test_write_disk_lookup tests expect user 'root' to exist, but
- ;; the chroot's /etc/passwd doesn't have it. Turn off those
tests.
- ;;
- ;; The tests allow one to disable tests matching a globbing
pattern.
- (invoke "make" "libarchive_test" "bsdcpio_test" "bsdtar_test")
- ;; XXX: This glob disables too much.
- (invoke "./libarchive_test" "^test_*_disk*")
- (invoke "./bsdcpio_test" "^test_owner_parse")
- (invoke "./bsdtar_test")))
+ ,@(if (%current-target-system)
+ '((lambda _
+ #t))
+ '((lambda _
+ ;; XXX: The test_owner_parse, test_read_disk, and
+ ;; test_write_disk_lookup tests expect user 'root' to
+ ;; exist, but the chroot's /etc/passwd doesn't have it.
+ ;; Turn off those tests.
+ ;;
+ ;; The tests allow one to disable tests matching a
+ ;; globbing pattern.
+ (invoke "make"
+ "libarchive_test"
+ "bsdcpio_test"
+ "bsdtar_test")
+ ;; XXX: This glob disables too much.
+ (invoke "./libarchive_test" "^test_*_disk*")
+ (invoke "./bsdcpio_test" "^test_owner_parse")
+ (invoke "./bsdtar_test")))))
(add-after 'install 'add--L-in-libarchive-pc
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- 11/31: gnu: texinfo: Fix cross-compilation., (continued)
- 11/31: gnu: texinfo: Fix cross-compilation., guix-commits, 2019/07/08
- 18/31: gnu: bc: Fix cross-compilation., guix-commits, 2019/07/08
- 15/31: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/07/08
- 20/31: gnu: libsamplerate: Fix aarch64 cross-compilation., guix-commits, 2019/07/08
- 10/31: gnu: openssl: Fix cross-compilation., guix-commits, 2019/07/08
- 09/31: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/07/08
- 21/31: gnu: mit-krb5: Fix cross-compilation., guix-commits, 2019/07/08
- 08/31: gnu: python: Fix cross-compilation., guix-commits, 2019/07/08
- 24/31: gnu: xmlto: Fix cross-compilation., guix-commits, 2019/07/08
- 31/31: gnu: glibc-utf8-locales: Fix cross-compilation., guix-commits, 2019/07/08
- 25/31: gnu: libarchive: Fix cross-compilation.,
guix-commits <=
- 28/31: gnu: mkfontdir: Fix aarch64 cross-compilation., guix-commits, 2019/07/08
- 03/31: gnu: tcl: Fix cross-compilation., guix-commits, 2019/07/08
- 17/31: gnu: texinfo-5: Fix cross-compilation., guix-commits, 2019/07/08
- 16/31: gnu: groff: Fix cross compilation., guix-commits, 2019/07/08
- 01/31: gnu: perl: Fix cross-compilation., guix-commits, 2019/07/08
- 23/31: gnu: help2man: Fix cross-compilation., guix-commits, 2019/07/08
- 12/31: gnu: cmake: Extend CMAKE_PREFIX_PATH to non-native inputs., guix-commits, 2019/07/08
- 06/31: gnu: xorg: Fix cross-compilation of multiple packages., guix-commits, 2019/07/08
- 07/31: gnu: libgpg-error: Fix cross compilation., guix-commits, 2019/07/08
- 02/31: gnu: python: Fix cross compilation., guix-commits, 2019/07/08