From: Efraim Flashner <efraim@flashner.co.il>
To: 47615@debbugs.gnu.org, guix-devel@gnu.org
Cc: Efraim Flashner <efraim@flashner.co.il>
Subject: [bug#47615] [PATCH 3/9] gnu: binutils: Adjust test suite on powerpc-linux.
Date: Tue, 6 Apr 2021 15:32:47 +0300 [thread overview]
Message-ID: <cff09d1a4d4201f5568bccfaad96fb624a1f4165.1617711307.git.efraim@flashner.co.il> (raw)
In-Reply-To: <cover.1617711307.git.efraim@flashner.co.il>
* 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 dbb7c619fe..b9fc0a6e29 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 7c39a84008..f707a01d30 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
--
2.31.1
next prev parent reply other threads:[~2021-04-06 12:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-06 12:24 [bug#47615] [PATCH 0/9] Add 32-bit powerpc support Efraim Flashner
2021-04-06 12:32 ` [bug#47615] [PATCH 1/9] gnu: bootstrap: Add support for powerpc-linux Efraim Flashner
[not found] ` <87pmyx1q36.fsf@gmail.com>
[not found] ` <CAEwRq=oDfHMMhMijVUb6LF_UXeG_9Pmi_jZU7nzqAz8eYD_NxA@mail.gmail.com>
2021-04-14 13:56 ` Efraim Flashner
2021-04-06 12:32 ` [bug#47615] [PATCH 2/9] gnu: guile-3.0: Fix building on powerpc-linux Efraim Flashner
2021-04-06 12:32 ` Efraim Flashner [this message]
[not found] ` <8735vo1yhm.fsf_-_@gmail.com>
[not found] ` <YHv6jDimnNGP3c2o@3900XT>
[not found] ` <87sg3izywb.fsf_-_@gmail.com>
2021-04-27 7:01 ` [bug#47615] [PATCH 3/9] gnu: binutils: Adjust test suite " Efraim Flashner
2021-04-06 12:32 ` [bug#47615] [PATCH 4/9] gnu: mesa: Add support for powerpc-linux Efraim Flashner
2021-04-06 12:32 ` [bug#47615] [PATCH 6/9] gnu: american-fuzzy-lop: " Efraim Flashner
2021-04-06 12:32 ` [bug#47615] [PATCH 7/9] build: qemu-command: Add support for powerpc Efraim Flashner
2021-04-06 12:32 ` [bug#47615] [PATCH 9/9] gnu: nss: Skip tests on powerpc-linux Efraim Flashner
2021-04-22 7:59 ` [bug#47615] [PATCH v2 00/12] Add 32-bit powerpc support Efraim Flashner
2021-04-22 7:59 ` [bug#47615] [PATCH v2 12/12] gnu: glib: Disable failing test Efraim Flashner
[not found] ` <297ae28469f64eef14d8a1e8fd0e9375d8f8b1ae.1619076704.git.efraim@flashner.co.il>
[not found] ` <87lf8rex5i.fsf_-_@gnu.org>
2021-05-06 15:48 ` [bug#47615] [PATCH 0/9] Add 32-bit powerpc support Efraim Flashner
2021-05-24 9:54 ` bug#47615: " Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cff09d1a4d4201f5568bccfaad96fb624a1f4165.1617711307.git.efraim@flashner.co.il \
--to=efraim@flashner.co.il \
--cc=47615@debbugs.gnu.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).