ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: tar: Fix test suite on 32-bit systems.

Browse source 
* gnu/packages/base.scm (tar)[arguments]: When building for 32-bit
systems skip a test known by upstream to fail.
This commit is contained in:
Efraim Flashner 2023-02-14 16:26:51 +02:00
parent fc588b99e5
commit 87423addf5
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/base.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Alex Kost <alezost@gmail.com> ;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2016, 2017, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
@ -216,7 +216,8 @@ (define-public tar
(build-system gnu-build-system) (build-system gnu-build-system)
;; Note: test suite requires ~1GiB of disk space. ;; Note: test suite requires ~1GiB of disk space.
(arguments (arguments
`(,@(if (hurd-target?) `(,@(cond
((hurd-target?)
'(#:make-flags '(#:make-flags
(list (string-append (list (string-append
"TESTSUITEFLAGS= -k '" "TESTSUITEFLAGS= -k '"
@ -231,8 +232,13 @@ (define-public tar
",!renamed subdirectories" ",!renamed subdirectories"
",!chained renames" ",!chained renames"
",!Directory" ",!Directory"
"'"))) "'"))))
'()) ;; https://lists.gnu.org/archive/html/bug-tar/2021-10/msg00007.html
;; tar-1.34 isn't aware of 64-bit time_t and upstream suggests
;; skipping the test for this release on 32-bit systems.
((not (target-64bit?))
'(#:make-flags (list "TESTSUITEFLAGS= -k 'tricky time stamps'")))
(else '()))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'build 'set-shell-file-name (add-before 'build 'set-shell-file-name
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)