nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: tar: Update to 1.32. 

* gnu/packages/base.scm (tar): Update to 1.32.
[arguments]: Remove #:make-flags and #:configure-flags.
This commit is contained in:
Marius Bakke 2019-02-23 19:13:37 +01:00
parent 3f544cf207
commit 218eb6e611
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnu/packages/base.scm
View File

@ -156,14 +156,14 @@ implementation offers several extensions over the standard utility.")
(define-public tar (define-public tar
(package (package
(name "tar") (name "tar")
(version "1.31") (version "1.32")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/tar/tar-" (uri (string-append "mirror://gnu/tar/tar-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1h9dxhjhz1jnyhmh6jfhqw1g1sxqbg3cd32vpwg7x2xxxqffzwrp")) "1n7xy657ii0sa42zx6944v2m4v9qrh6sqgmw17l3nch3y43sxlyh"))
(patches (search-patches "tar-skip-unreliable-tests.patch" (patches (search-patches "tar-skip-unreliable-tests.patch"
"tar-remove-wholesparse-check.patch")))) "tar-remove-wholesparse-check.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -177,27 +177,7 @@ implementation offers several extensions over the standard utility.")
(substitute* "src/system.c" (substitute* "src/system.c"
(("/bin/sh") (("/bin/sh")
(string-append bash "/bin/sh"))) (string-append bash "/bin/sh")))
#t)))) #t))))))
;; Work around a cross-compilation bug whereby libgnu.a would provide
;; '__mktime_internal', which conflicts with the one in libc.a.
,@(if (%current-target-system)
`(#:configure-flags '("gl_cv_func_working_mktime=yes"))
'())
;; Test #92 "link mismatch" expects "a/z: Not linked to a/y" but gets
;; "a/y: Not linked to a/z" and fails, presumably due to differences in
;; the order in which 'diff' traverses directories. That leads to a
;; test failure even though conceptually the test passes. Skip it.
;; Test 117 and 118 are prone to race conditions too, particularly
;; when cross-compiling, so we skip those as well. All issues have
;; been fixed upstream in these commits:
;; <https://git.savannah.gnu.org/cgit/tar.git/commit/?id=847a36f>
;; <https://git.savannah.gnu.org/cgit/tar.git/commit/?id=64b43fd>
#:make-flags (list (string-append
"TESTSUITEFLAGS= -k '!link mismatch,"
"!directory removed before reading,"
"!explicitly named directory removed before reading'"))))
;; When cross-compiling, the 'set-shell-file-name' phase needs to be able ;; When cross-compiling, the 'set-shell-file-name' phase needs to be able
;; to refer to the target Bash. ;; to refer to the target Bash.