[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/35: gnu: libarchive: Fix cross-compilation.
From: |
guix-commits |
Subject: |
15/35: gnu: libarchive: Fix cross-compilation. |
Date: |
Thu, 10 Oct 2019 11:33:17 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 5fd395db3f6b425a04675b96279f92ea86aa1c54
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 | 47 +++++++++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index a92c8c9..512882c 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2018, 2019 Ricardo Wurmus <address@hidden>
;;; Copyright © 2019 Alex Vong <address@hidden>
;;; Copyright © 2019 Marius Bakke <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -230,24 +231,34 @@ 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.
- ;;
- ;; XXX: Adjust test that fails with zstd 1.4.1 because the default
- ;; options compresses two bytes better than this test expects.
- ;; https://github.com/libarchive/libarchive/issues/1226
- (substitute* "libarchive/test/test_write_filter_zstd.c"
- (("compression-level\", \"6\"")
- "compression-level\", \"7\""))
-
- ;; 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")))
+ (lambda* (#:key (tests? #t) #:allow-other-keys)
+ (if tests?
+ ;; 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.
+ ;;
+ ;; XXX: Adjust test that fails with zstd 1.4.1
+ ;; because the default options compresses two bytes
+ ;; better than this test expects.
+ ;; https://github.com/libarchive/libarchive/issues/1226
+ (begin
+ (substitute* "libarchive/test/test_write_filter_zstd.c"
+ (("compression-level\", \"6\"")
+ "compression-level\", \"7\""))
+
+ ;; 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"))
+ ;; Tests may be disabled if cross-compiling.
+ (format #t "Test suite not run.~%"))))
(add-after 'install 'add--L-in-libarchive-pc
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- 08/35: gnu: python: Further cross-compilation fixes., (continued)
- 08/35: gnu: python: Further cross-compilation fixes., guix-commits, 2019/10/10
- 16/35: gnu: tcsh: Fix cross-compilation., guix-commits, 2019/10/10
- 30/35: gnu: procps: Fix cross-compilation., guix-commits, 2019/10/10
- 29/35: gnu: nghttp2: Fix cross-compilation., guix-commits, 2019/10/10
- 09/35: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/10/10
- 03/35: gnu: python: Fix cross compilation., guix-commits, 2019/10/10
- 10/35: gnu: libgit2: Fix cross compilation., guix-commits, 2019/10/10
- 17/35: gnu: pkg-config: Fix cross-compilation., guix-commits, 2019/10/10
- 11/35: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/10/10
- 19/35: gnu: texinfo: Fix cross-compilation., guix-commits, 2019/10/10
- 15/35: gnu: libarchive: Fix cross-compilation.,
guix-commits <=
- 32/35: gnu: mdadm: Fix cross-compilation., guix-commits, 2019/10/10
- 28/35: gnu: lvm2: Fix cross-compilation., guix-commits, 2019/10/10
- 27/35: gnu: mkfontdir: Fix aarch64 cross-compilation., guix-commits, 2019/10/10
- 26/35: gnu: libsamplerate: Fix aarch64 cross-compilation., guix-commits, 2019/10/10
- 12/35: gnu: mit-krb5: Fix cross-compilation., guix-commits, 2019/10/10
- 13/35: gnu: help2man: Fix cross-compilation., guix-commits, 2019/10/10
- 25/35: gnu: indent: Fix aarch64 cross-compilation., guix-commits, 2019/10/10
- 21/35: gnu: texinfo-4: Fix cross compilation, guix-commits, 2019/10/10
- 18/35: gnu: alsa-utils: Fix cross-compilation., guix-commits, 2019/10/10
- 20/35: gnu: texinfo-5: Fix cross-compilation., guix-commits, 2019/10/10