ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: diffutils: Skip failing test on GNU/Hurd.

Browse source 
* gnu/packages/base.scm (diffutils)[arguments]: Add #:make-flags.
* gnu/packages/commencement.scm (diffutils-boot0)[arguments]: Adjust to always
use substitute-keyword-arguments.
This commit is contained in:
Christopher Baines 2022-10-28 15:14:30 +01:00
parent fe20121dc7
commit 2a152e1a42
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/base.scm
View file

@ -283,6 +283,10 @@ (define-public diffutils
"1v4g8gi0lgakqa7iix8s4fq7lq6l92vw3rjd9wfd2rhjng8xggd6")) "1v4g8gi0lgakqa7iix8s4fq7lq6l92vw3rjd9wfd2rhjng8xggd6"))
(patches (search-patches "diffutils-fix-signal-processing.patch")))) (patches (search-patches "diffutils-fix-signal-processing.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:make-flags ,(if (hurd-target?)
''("XFAIL_TESTS=test-perror2")
''())))
(native-inputs (list perl)) (native-inputs (list perl))
(synopsis "Comparing and merging files") (synopsis "Comparing and merging files")
(description (description

12
gnu/packages/commencement.scm
View file

@ -2475,15 +2475,15 @@ (define diffutils-boot0
`(#:tests? #f ; the test suite needs diffutils `(#:tests? #f ; the test suite needs diffutils
#:guile ,%bootstrap-guile #:guile ,%bootstrap-guile
#:implicit-inputs? #f #:implicit-inputs? #f
,@(match (%current-system) ,@(substitute-keyword-arguments (package-arguments diffutils)
((or "arm-linux" "aarch64-linux") ((#:configure-flags flags ''())
(substitute-keyword-arguments (package-arguments diffutils) (match (%current-system)
((#:configure-flags flags ''()) ((or "arm-linux" "aarch64-linux")
;; The generated config.status has some problems due to the ;; The generated config.status has some problems due to the
;; bootstrap environment. Disable dependency tracking to work ;; bootstrap environment. Disable dependency tracking to work
;; around it. ;; around it.
`(cons "--disable-dependency-tracking" ,flags)))) `(cons "--disable-dependency-tracking" ,flags))
(_ '())))))) (_ flags))))))))
(define findutils-boot0 (define findutils-boot0
(package (package