[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch wip-ppc64le updated: gnu: commencement: Fix findutils-boot0 on so
From: |
guix-commits |
Subject: |
branch wip-ppc64le updated: gnu: commencement: Fix findutils-boot0 on some systems. |
Date: |
Wed, 24 Feb 2021 13:40:31 -0500 |
This is an automated email from the git hooks/post-receive script.
marusich pushed a commit to branch wip-ppc64le
in repository guix.
The following commit(s) were added to refs/heads/wip-ppc64le by this push:
new d837b21 gnu: commencement: Fix findutils-boot0 on some systems.
d837b21 is described below
commit d837b21ea04cc9c65bd386e4d999b65386b1bc41
Author: Chris Marusich <cmmarusich@gmail.com>
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 f5efe2f..1c922e9 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2510,6 +2510,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 glibc-mesboot@2.16, due
@@ -2517,7 +2520,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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch wip-ppc64le updated: gnu: commencement: Fix findutils-boot0 on some systems.,
guix-commits <=