From patchwork Wed May 10 12:28:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 49909 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 EF7B927BBEC; Wed, 10 May 2023 13:29:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A73C027BBEE for ; Wed, 10 May 2023 13:29:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwiwN-00077J-11; Wed, 10 May 2023 08:29:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pwiwJ-000755-62 for guix-patches@gnu.org; Wed, 10 May 2023 08:29:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pwiwH-0000sH-SW for guix-patches@gnu.org; Wed, 10 May 2023 08:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pwiwH-0003jn-JI for guix-patches@gnu.org; Wed, 10 May 2023 08:29:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63416] [PATCH 1/2] gnu: gcc: Change custom-gcc to use gexp's. References: <87o7ms1if5.fsf@cbaines.net> In-Reply-To: <87o7ms1if5.fsf@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2023 12:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63416 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63416@debbugs.gnu.org Received: via spool by 63416-submit@debbugs.gnu.org id=B63416.168372173914351 (code B ref 63416); Wed, 10 May 2023 12:29:01 +0000 Received: (at 63416) by debbugs.gnu.org; 10 May 2023 12:28:59 +0000 Received: from localhost ([127.0.0.1]:45468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwiwE-0003jO-Sg for submit@debbugs.gnu.org; Wed, 10 May 2023 08:28:59 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwiwD-0003jC-ON for 63416@debbugs.gnu.org; Wed, 10 May 2023 08:28:58 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 20A3427BBEC for <63416@debbugs.gnu.org>; Wed, 10 May 2023 13:28:57 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 24f25d56 for <63416@debbugs.gnu.org>; Wed, 10 May 2023 12:28:56 +0000 (UTC) From: Christopher Baines Date: Wed, 10 May 2023 13:28:55 +0100 Message-Id: X-Mailer: git-send-email 2.39.1 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches As this seems to be generating broken derivations for i586-gnu otherwise. * gnu/packages/gcc.scm (custom-gcc): Use gexp's for the generated package arguments. --- gnu/packages/gcc.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) base-commit: e0c35d1578c10a8fe27c8372f3a8bb5dd88b01b8 diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 47fb443155..2bd4cad6ec 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1043,18 +1043,18 @@ (define* (custom-gcc gcc name languages (srfi srfi-26) (ice-9 regex))) ((#:configure-flags flags) - `(cons (string-append "--enable-languages=" - ,(string-join languages ",")) - (remove (cut string-match "--enable-languages.*" <>) - ,flags))) + #~(cons (string-append "--enable-languages=" + ,(string-join languages ",")) + (remove (cut string-match "--enable-languages.*" <>) + #$flags))) ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'remove-broken-or-conflicting-files - (lambda* (#:key outputs #:allow-other-keys) - (for-each - delete-file - (find-files (string-append (assoc-ref outputs "out") "/bin") - ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|lto)(-.*)?$")))))))))) + #~(modify-phases #$phases + (add-after 'install 'remove-broken-or-conflicting-files + (lambda* (#:key outputs #:allow-other-keys) + (for-each + delete-file + (find-files (string-append (assoc-ref outputs "out") "/bin") + ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|lto)(-.*)?$")))))))))) (define %generic-search-paths ;; This is the language-neutral search path for GCC. Entries in $CPATH are