[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
20/26: gnu: commencement: Fix findutils-boot0 on some systems.
From: |
guix-commits |
Subject: |
20/26: gnu: commencement: Fix findutils-boot0 on some systems. |
Date: |
Sun, 7 Mar 2021 22:00:18 -0500 (EST) |
marusich pushed a commit to branch wip-ppc64le
in repository guix.
commit a776f08bfbb6edcfde951acc02d6cc37008e0eaf
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 f4d285d..0099c02 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
- 23/26: gnu: openjpeg: Disable failing tests group., (continued)
- 23/26: gnu: openjpeg: Disable failing tests group., guix-commits, 2021/03/07
- 24/26: gnu: rust: Make it "supported" on all systems but i686-linux., guix-commits, 2021/03/07
- 25/26: tests: guix-environment.sh: Use C_INCLUDE_PATH, not CPATH., guix-commits, 2021/03/07
- 10/26: gnu: texlive-bin: Fix compilation on powerpc64le*., guix-commits, 2021/03/07
- 13/26: Add powerpc64le-linux as a supported Guix architecture., guix-commits, 2021/03/07
- 14/26: syscalls: Fix clone on powerpc64le-linux., guix-commits, 2021/03/07
- 16/26: ci: %cross-targets: Add powerpc64le-linux-gnu., guix-commits, 2021/03/07
- 17/26: utils: Fix target-64bit? on powerpc64le-linux., guix-commits, 2021/03/07
- 18/26: tests: gremlin: Skip file-needed/recursive if DT_NEEDED is empty., guix-commits, 2021/03/07
- 19/26: tests: pack: Fix %gzip-compressor and a failing test., guix-commits, 2021/03/07
- 20/26: gnu: commencement: Fix findutils-boot0 on some systems.,
guix-commits <=
- 21/26: gnu: gcc: Set gcc-8 as default., guix-commits, 2021/03/07
- 22/26: .guix-authorizations: Add lle_bout., guix-commits, 2021/03/07
- 26/26: gnu: emacs: Use librsvg and gtk+ on x86_64-linux only., guix-commits, 2021/03/07