From patchwork Tue Nov 12 16:25:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70290 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 7272C27BBE2; Tue, 12 Nov 2024 16:30:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 C2FE327BBE9 for ; Tue, 12 Nov 2024 16:30:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmS-0003uX-5v; Tue, 12 Nov 2024 11:30:16 -0500 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 1tAtmQ-0003nr-48 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:14 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmP-0005uz-QM; Tue, 12 Nov 2024 11:30:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=dxsipSKXtyTMm+IKaV7Euha9ospjvvMuWJs2OXXEos0=; b=c3YCOLMvPLN2eGCDdD4zL/QyDlDP5MyG2e3eNrsMFlyUIsPnw+MClR3Tvk4cS1TmcTvC+1+N5ocoEdfoIGjti8F/SfzaOdbHuSypiqBGVnx82wRYFtDlohMfxzZ7QGwh7ma5P0hJoFc7zPcg/HjBYKjHbtJfcTc1f+qsRWDh4sONRpuy6CG04qrwAf94ycL43DfUGnA0PHfcjMEyzaRP/3eapmbkozcI9z6E+A9PcjRn0+mkqF/tVgCGhYMQLtbFXceUV0Xdd9dstvcPRdiFcvZJb3Qgri+LjAr2T47Fufa9H17qyd6X6Nite0SyycRA/BhoK+lXKR12kEgiGQSrlQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmP-0000VI-Fd; Tue, 12 Nov 2024 11:30:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 13/40] gnu: gcc-13, gcc-14: Support being used as parent for gcc-static. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289721238 (code B ref 74290); Tue, 12 Nov 2024 16:30:13 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:32 +0000 Received: from localhost ([127.0.0.1]:39107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlj-0000Ji-QK for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlX-0000Gm-CJ for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:19 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjL-0005Lz-I1; Tue, 12 Nov 2024 11:27:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=dxsipSKXtyTMm+IKaV7Euha9ospjvvMuWJs2OXXEos0=; b=PQtlzjkZTDE6ocX/lgBz oEE/kSMTOhPtd1vjsCfvXx0pr0X6ke9I76Il/sABG1Fru8k4qRoIo9CH7/4Zk9i3ZxnKKcNqiIQPV oSzc9irDCBUKqPTxggxIFO8GEDed7ndeTT/BIVmdP8LIAIGy87OWY8puXZeqayIhOQ7ex4Cc0QUK0 Rp9X5Wf/S7HMwJhylZs693U0HkDFzeL/uKQToc6/6Swmaxqp7UJByOudsy35pun1KSiUeEU9mL4Vr umcbbhDa9UyghZcfSxpflqzU/S8csZ+XQB/18CLGRA23LoVDKa3FY7OII1Q+miEKQur4B70nCT5qQ jOh10DeI3FJD7w==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:22 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gcc.scm (gcc-13)[arguments]: Use quasiquote instead of g-expressions. (gcc-14)[arguments]: Likewise. Change-Id: I22269b31d49868effe967d46247b189ed9a9d394 --- gnu/packages/gcc.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 850a14cb1c..befbbda027 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -811,10 +811,10 @@ (define-public gcc-13 (snippet gcc-canadian-cross-objdump-snippet))) (arguments (substitute-keyword-arguments (package-arguments gcc-11) - ((#:phases phases #~%standard-phases) + ((#:phases phases '%standard-phases) (if (target-hurd?) - #~(modify-phases #$phases - (delete 'patch-hurd-libpthread)) + `(modify-phases ,phases + (delete 'patch-hurd-libpthread)) phases)))) (properties `((compiler-cpu-architectures @@ -841,8 +841,8 @@ (define-public gcc-14 (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (arguments (substitute-keyword-arguments (package-arguments gcc-13) - ((#:phases phases #~%standard-phases) - #~(modify-phases #$phases + ((#:phases phases '%standard-phases) + `(modify-phases ,phases (add-before 'configure 'pre-x86-configure (lambda _ (substitute* "gcc/config/i386/t-linux64"