marusich pushed a commit to branch wip-ppc64le
in repository guix.
commit f4cbd18d0e43d856e83b5d1a0603412d4eb8cbf1
Author: Chris Marusich <[email protected]>
AuthorDate: Wed Feb 24 10:11:14 2021 -0800
gnu: commencement: Fix findutils-boot0 on some systems.
This fixes an issue where findutils-boot0 would fail to build ("XPASS:
test-fnmatch") on some systems, in particular powerpc64le-linux.
* gnu/packages/commencement.scm (findutils-boot0): Delete the
skip-fnmatch-test phase on any system that does not build this package using
glibc-mesboot, i.e. any system that is not x86_64-linux or i686-linux.
---
gnu/packages/commencement.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index f6bfc27..4de9112 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2512,6 +2512,9 @@ exec " gcc "/bin/" program
,flags))
((#:phases phases '%standard-phases)
`(modify-phases ,phases
+ ;; XXX On architectures that do not build this package using
+ ;; glibc-mesboot, this phase is not needed, so we we
+ ;; immediately delete it below.
(add-before 'check 'skip-fnmatch-test
(lambda _
;; 'test-fnmatch' fails when using [email protected], due
@@ -2519,7 +2522,11 @@ exec " gcc "/bin/" program
;; class. Ignore it.
(substitute* "gnulib-tests/Makefile"
(("^XFAIL_TESTS =")
- "XFAIL_TESTS = test-fnmatch ")))))))))))
+ "XFAIL_TESTS = test-fnmatch "))))
+ ,@(match (%current-system)
+ ((or "x86_64-linux" "i686-linux")
+ '())
+ (_ '((delete 'skip-fnmatch-test)))))))))))
(define file
(package
