From patchwork Tue Apr 6 12:32:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 28333 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D8F4727BC68; Tue, 6 Apr 2021 13:37:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9227E27BC67 for ; Tue, 6 Apr 2021 13:37:09 +0100 (BST) Received: from localhost ([::1]:53454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTkxA-0006dB-LP for patchwork@mira.cbaines.net; Tue, 06 Apr 2021 08:37:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTkvE-0004S3-2O for guix-patches@gnu.org; Tue, 06 Apr 2021 08:35:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56157) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTkv8-0001cp-Pi for guix-patches@gnu.org; Tue, 06 Apr 2021 08:35:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lTkv8-0003uS-L6 for guix-patches@gnu.org; Tue, 06 Apr 2021 08:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47615] [PATCH 3/9] gnu: binutils: Adjust test suite on powerpc-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Apr 2021 12:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47615 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47615@debbugs.gnu.org, guix-devel@gnu.org Cc: Efraim Flashner Received: via spool by 47615-submit@debbugs.gnu.org id=B47615.161771248614996 (code B ref 47615); Tue, 06 Apr 2021 12:35:02 +0000 Received: (at 47615) by debbugs.gnu.org; 6 Apr 2021 12:34:46 +0000 Received: from localhost ([127.0.0.1]:39469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lTkus-0003to-6n for submit@debbugs.gnu.org; Tue, 06 Apr 2021 08:34:46 -0400 Received: from flashner.co.il ([178.62.234.194]:45566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lTkup-0003ta-Um for 47615@debbugs.gnu.org; Tue, 06 Apr 2021 08:34:44 -0400 Received: from localhost (unknown [31.210.177.71]) by flashner.co.il (Postfix) with ESMTPSA id 124E54024A; Tue, 6 Apr 2021 12:34:37 +0000 (UTC) From: Efraim Flashner Date: Tue, 6 Apr 2021 15:32:47 +0300 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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