me/guix
Archived
1
0
Fork 0
Code Activity

gnu: findutils-boot0: Really disable 'test-fnmatch' on i686-linux.

Browse source 
Commit f08b070019 intended to skip
'test-fnmatch' on both x86_64-linux and i686-linux but it ended up
skipping it on x86_64-linux only.

* gnu/packages/commencement.scm (findutils-boot0)[arguments]: Use
'member' to test whether (%current-system) is "x86_64-linux" or
"i686-linux".
This commit is contained in:
Ludovic Courtès 2021-07-02 11:47:17 +02:00
parent 98c075c24e
commit fb40ec8aab
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/commencement.scm
View file

@ -2516,14 +2516,14 @@ exec " gcc "/bin/" program
;; 'test-fnmatch' fails when using glibc-mesboot@2.16, due ;; 'test-fnmatch' fails when using glibc-mesboot@2.16, due
;; to incorrect handling of the [:alpha:] regexp character ;; to incorrect handling of the [:alpha:] regexp character
;; class. Ignore it. ;; class. Ignore it.
,@(if (string=? (%current-system) ,@(if (member (%current-system)
(or "x86_64-linux" "i686-linux")) '("x86_64-linux" "i686-linux"))
'((add-before 'check 'skip-fnmatch-test '((add-before 'check 'skip-fnmatch-test
(lambda _ (lambda _
(substitute* "gnulib-tests/Makefile" (substitute* "gnulib-tests/Makefile"
(("^XFAIL_TESTS =") (("^XFAIL_TESTS =")
"XFAIL_TESTS = test-fnmatch "))))) "XFAIL_TESTS = test-fnmatch ")))))
'())))))))) '()))))))))
(define file (define file
(package (package