From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2OPuE/9VbGAS4wAAgWs5BA (envelope-from ) for ; Tue, 06 Apr 2021 14:37:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wOiADf9VbGBDCwAAB5/wlQ (envelope-from ) for ; Tue, 06 Apr 2021 12:37:19 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BBB66250BE for ; Tue, 6 Apr 2021 14:37:18 +0200 (CEST) Received: from localhost ([::1]:53454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTkxH-0006dB-Qg for larch@yhetil.org; Tue, 06 Apr 2021 08:37:15 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617712639; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=HmWzlq3VKKk2wAVqTHxbgKnxbZwoYKDT7V4ClXmsnKs=; b=ePms7U9ctp5Q6gdS+Hrt+FvRk2GLPGT8L3mGOEjkgl1CQm0qeSb+mLjFcaWB7PCyXGMePS VByoFo3nIOFZg/uZr/Pm4ALJiUdY6aXMycREy7YI8rVhbMPJYxcVSqtJFJOsXyzrzFc0fB /dGHYmSlw96/KhyJN14y8MPDd65tFIndLDq055L62KZryX9G5NfGsiVouSgdOZLJBWDv8+ 5XET44HVDWrXxYjoM+2Dooo+DNUKeOYe0hBc0C/IRlzej4lmwkCu/dUNkXEMmtWsdJiLrO 3kD+j+42rxZlq2UfdJf8tdCz8f64JOytWFa2HIEPOOHp/DjlDMNwJM7Lcjs6Zw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617712639; a=rsa-sha256; cv=none; b=jga02FdZdVW7cYsC6d4UkBFbZmV6PA2mQn9tbM+JyZB+WOL0CN82kCU+q2Bomp/9gxqKgW T+4Ro7zg0K/s9ChPRe84J66pPp2WZnotzXfor0xSR8gV4/OVFzP53LcQrF705rtDHZNp82 nmXapV0laxqULkuFOKe6NN3dSAX1XLWpIa0BboDK2sTwKpciCgcOmhIjzVry6NTUfSklW8 uwVEQyMkcldcIHZNrRyJR5SIAHjj93cIF8notQK5e9dX82PJSqHalmcD1nmxDAitFYU+5P yJXlBx0bM/wECHjEkW4MO+Hq6wHrlYwv/sYdtxzjAb/jlanfzrJzPzvN4PAQGA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 4.06 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: BBB66250BE X-Spam-Score: 4.06 X-Migadu-Scanner: scn0.migadu.com X-TUID: u6UAlaAqK6He * 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