[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH 25/31] gnu: libarchive: Fix cross-compilation.
From: |
Marius Bakke |
Subject: |
[bug#36477] [PATCH 25/31] gnu: libarchive: Fix cross-compilation. |
Date: |
Mon, 08 Jul 2019 20:25:22 +0200 |
User-agent: |
Notmuch/0.29.1 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu) |
Mathieu Othacehe <address@hidden> writes:
> * gnu/packages/backup.scm (libarchive)[arguments]: Do not build and run tests
> when cross-compiling.
[...]
> @@ -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))
When I think about it, gnu-build-system already sets #:tests? #f when
cross-compiling. So this and similar changes can be rewritten to simply
check the tests? variable:
(replace 'check
(lambda* (#:key (tests? #t) #:allow-other-keys)
(if tests?
...
(format #t "test suite not run~%"))))
(obviously, you should check that this works instead of taking my word
for it. But it looks cleaner this way. LGTM anyway.)
signature.asc
Description: PGP signature
- [bug#36477] [PATCH 19/31] gnu: indent: Fix aarch64 cross-compilation., (continued)
- [bug#36477] [PATCH 22/31] gnu: cyrus-sasl: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 24/31] gnu: xmlto: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 25/31] gnu: libarchive: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 25/31] gnu: libarchive: Fix cross-compilation.,
Marius Bakke <=
- [bug#36477] [PATCH 20/31] gnu: libsamplerate: Fix aarch64 cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 30/31] gnu: icu4c: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 26/31] gnu: tcsh: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 21/31] gnu: mit-krb5: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 17/31] gnu: texinfo-5: Fix cross-compilation., Mathieu Othacehe, 2019/07/08