all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
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





  parent reply	other threads:[~2021-04-06 12:37 UTC|newest]

Thread overview: 64+ 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
2021-04-14  3:51   ` bug#47615: " Chris Marusich
2021-04-14  7:36     ` Vincent Legoll
2021-04-14 13:56       ` [bug#47615] " Efraim Flashner
2021-05-05  1:52     ` bug#47615: " Chris Marusich
2021-05-05  8:51       ` Efraim Flashner
2021-05-06 16:35       ` Ludovic Courtès
2021-04-06 12:32 ` [bug#47615] [PATCH 2/9] gnu: guile-3.0: Fix building on powerpc-linux Efraim Flashner
2021-04-14  4:00   ` bug#47615: " Chris Marusich
2021-04-14 14:00     ` Efraim Flashner
2021-04-06 12:32 ` Efraim Flashner [this message]
2021-04-17 19:51   ` bug#47615: [PATCH 0/9] Add 32-bit powerpc support Chris Marusich
2021-04-17 20:02     ` bug#47615: [PATCH 3/9] gnu: binutils: Adjust test suite on powerpc-linux Chris Marusich
2021-04-18  9:23     ` bug#47615: [PATCH 0/9] Add 32-bit powerpc support Efraim Flashner
2021-04-22  5:11       ` bug#47615: [PATCH 3/9] gnu: binutils: Adjust test suite on powerpc-linux Chris Marusich
2021-04-27  7:01         ` [bug#47615] " Efraim Flashner
2021-04-06 12:32 ` [bug#47615] [PATCH 4/9] gnu: mesa: Add support for powerpc-linux Efraim Flashner
2021-04-06 19:29   ` Efraim Flashner
2021-04-06 12:32 ` [PATCH 5/9] gnu: Add mac-fdisk Efraim Flashner
2021-04-06 12:32 ` [bug#47615] [PATCH 6/9] gnu: american-fuzzy-lop: Add support for powerpc-linux Efraim Flashner
2021-04-14  3:25   ` bug#47615: [PATCH 0/9] Add 32-bit powerpc support Chris Marusich
2021-04-06 12:32 ` [bug#47615] [PATCH 7/9] build: qemu-command: Add support for powerpc Efraim Flashner
2021-04-06 17:02   ` Vincent Legoll
2021-04-06 19:17     ` Efraim Flashner
2021-04-06 22:27       ` Vincent Legoll
2021-04-06 12:32 ` [PATCH 8/9] gnu: mercurial: Skip tests on powerpc-linux Efraim Flashner
2021-04-06 12:32 ` [bug#47615] [PATCH 9/9] gnu: nss: " Efraim Flashner
2021-04-06 17:00   ` Vincent Legoll
2021-04-06 19:18     ` Efraim Flashner
2021-04-06 22:31       ` Vincent Legoll
2021-04-07 20:33 ` [PATCH 0/9] Add 32-bit powerpc support Vincent Legoll
2021-04-08  7:00   ` Efraim Flashner
2021-04-17 16:04 ` Ludovic Courtès
2021-04-17 16:51   ` Vincent Legoll
2021-04-17 19:42   ` Efraim Flashner
2021-04-17 20:07     ` Vincent Legoll
2021-05-06 14:38     ` bug#47615: " Ludovic Courtès
2021-05-10  8:20       ` Efraim Flashner
2021-05-11 20:24         ` Ludovic Courtès
2021-05-24  9:51           ` Efraim Flashner
2021-05-26 14:09             ` Ludovic Courtès
2021-05-31 10:23               ` Tobias Platen
2021-04-22  7:59 ` [bug#47615] [PATCH v2 00/12] " Efraim Flashner
2021-04-22  7:59   ` [PATCH v2 01/12] gnu: bootstrap: Add support for powerpc-linux Efraim Flashner
2021-04-22  7:59   ` [PATCH v2 02/12] gnu: guile-3.0: Fix building on powerpc-linux Efraim Flashner
2021-05-06 14:45     ` bug#47615: [PATCH 0/9] Add 32-bit powerpc support Ludovic Courtès
2021-05-10  8:01       ` Efraim Flashner
2021-04-22  7:59   ` [PATCH v2 03/12] gnu: gcc-boot0: Use 128-bit long-double on powerpc-linux Efraim Flashner
2021-04-22  7:59   ` [PATCH v2 04/12] gnu: binutils: Fix bug in test suite in libiberty Efraim Flashner
2021-04-22  7:59   ` [PATCH v2 05/12] gnu: mesa: Add support for powerpc-linux Efraim Flashner
2021-04-22  7:59   ` [PATCH v2 06/12] gnu: Add mac-fdisk Efraim Flashner
2021-05-06 14:48     ` bug#47615: [PATCH 0/9] Add 32-bit powerpc support Ludovic Courtès
2021-05-06 15:48       ` [bug#47615] " Efraim Flashner
2021-04-22  7:59   ` [PATCH v2 07/12] gnu: american-fuzzy-lop: Add support for powerpc-linux Efraim Flashner
2021-04-22  7:59   ` [PATCH v2 08/12] build: qemu-command: Add support for powerpc Efraim Flashner
2021-04-22  7:59   ` [PATCH v2 09/12] gnu: mercurial: Skip tests on powerpc-linux Efraim Flashner
2021-04-22 16:41     ` [bug#47615] " Maxime Devos
2021-05-06 14:51       ` bug#47615: [PATCH 0/9] Add 32-bit powerpc support Ludovic Courtès
2021-04-22  7:59   ` [PATCH v2 10/12] gnu: nss: Skip tests on powerpc-linux Efraim Flashner
2021-04-22  7:59   ` [PATCH v2 11/12] gnu: zstd: Adjust test suite for 32-bit architectures Efraim Flashner
2021-04-22  7:59   ` [bug#47615] [PATCH v2 12/12] gnu: glib: Disable failing test Efraim Flashner
2021-05-04 15:50   ` [PATCH v2 00/12] Add 32-bit powerpc support Efraim Flashner
2021-05-24  9:54 ` bug#47615: [PATCH 0/9] " 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

* 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 external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.