[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/09: gnu: binutils: Adjust test suite on powerpc-linux.
From: |
guix-commits |
Subject: |
03/09: gnu: binutils: Adjust test suite on powerpc-linux. |
Date: |
Tue, 30 Mar 2021 07:51:40 -0400 (EDT) |
efraim pushed a commit to branch wip-ppc
in repository guix.
commit cff09d1a4d4201f5568bccfaad96fb624a1f4165
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Mar 9 19:32:02 2021 +0200
gnu: binutils: Adjust test suite on powerpc-linux.
* gnu/packages/base.scm (binutils)[arguments]: Add phase on
powerpc-linux to adjust the test suite.
* gnu/packages/commencement.scm (binutils-boot0)[arguments]: Move custom
phases after inherited arguments. Add phase on powerpc-linux to adjust
the test suite.
---
gnu/packages/base.scm | 11 ++++++++++-
gnu/packages/commencement.scm | 21 ++++++++++++++++-----
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index dbb7c61..b9fc0a6 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -531,7 +531,16 @@ change. GNU make offers many powerful extensions over the
standard utility.")
;; Make sure 'ar' and 'ranlib' produce archives in a
;; deterministic fashion.
- "--enable-deterministic-archives")))
+ "--enable-deterministic-archives")
+ ,@(if (string=? (%current-system) "powerpc-linux")
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-rust-libiberty-test
+ (lambda _
+ (substitute* "libiberty/testsuite/Makefile.in"
+ ((" check-rust-demangle ") ""))
+ #t))))
+ '())))
(synopsis "Binary utilities: bfd gas gprof ld")
(description
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 7c39a84..f707a01 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2653,7 +2653,22 @@ exec " gcc "/bin/" program
#:modules ((guix build gnu-build-system)
(guix build utils)
(ice-9 ftw)) ; for 'scandir'
+
+ ;; #:phases gets modified for powerpc-linux in binutils,
+ ;; so #:phases here needs to be after the inherited one.
+ ,@(substitute-keyword-arguments (package-arguments binutils)
+ ((#:configure-flags cf)
+ `(cons ,(string-append "--target=" (boot-triplet))
+ ,cf)))
+
#:phases (modify-phases %standard-phases
+ ,@(if (string=? (%current-system) "powerpc-linux")
+ '((add-after 'unpack 'disable-rust-libiberty-test
+ (lambda _
+ (substitute* "libiberty/testsuite/Makefile.in"
+ ((" check-rust-demangle ") ""))
+ #t)))
+ '())
(add-after 'install 'add-symlinks
(lambda* (#:key outputs #:allow-other-keys)
;; The cross-gcc invokes 'as', 'ld', etc, without the
@@ -2667,12 +2682,8 @@ exec " gcc "/bin/" program
(with-directory-excursion (string-append out "/bin")
(for-each (lambda (name)
(symlink name (remove-triplet-prefix
name)))
- (scandir "." has-triplet-prefix?)))))))
+ (scandir "." has-triplet-prefix?)))))))))
- ,@(substitute-keyword-arguments (package-arguments binutils)
- ((#:configure-flags cf)
- `(cons ,(string-append "--target=" (boot-triplet))
- ,cf)))))
(inputs (%boot0-inputs))))
(define libstdc++-boot0
- branch wip-ppc created (now b0b76cd), guix-commits, 2021/03/30
- 01/09: gnu: bootstrap: Add support for powerpc-linux., guix-commits, 2021/03/30
- 06/09: gnu: american-fuzzy-lop: Add support for powerpc-linux., guix-commits, 2021/03/30
- 09/09: gnu: nss: Skip tests on powerpc-linux., guix-commits, 2021/03/30
- 03/09: gnu: binutils: Adjust test suite on powerpc-linux.,
guix-commits <=
- 04/09: gnu: mesa: Add support for powerpc-linux., guix-commits, 2021/03/30
- 08/09: gnu: mercurial: Skip tests on powerpc-linux., guix-commits, 2021/03/30
- 02/09: gnu: guile-3.0: Fix building on powerpc-linux., guix-commits, 2021/03/30
- 07/09: build: qemu-command: Add support for powerpc., guix-commits, 2021/03/30
- 05/09: gnu: Add mac-fdisk., guix-commits, 2021/03/30