From patchwork Sun Nov 10 10:38:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70182 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 A176227BBEA; Sun, 10 Nov 2024 10:40:30 +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 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 5C07627BBE2 for ; Sun, 10 Nov 2024 10:40:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5MS-0000tF-Au; Sun, 10 Nov 2024 05:40:04 -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 1tA5MQ-0000sD-K0 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:02 -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 1tA5MQ-00083R-AT; Sun, 10 Nov 2024 05:40:02 -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=VY1Xg+FJLfj91ZXvWECiH7Xn714h2VViV8ChTHyukp8uYaXRexIF7X/JztOBTCExHrZsW5g+Df58MzsniGieIuzLujGNK8kgroyUkfN4y81/aZDyXGbxLEp8B0bHatOJrOs9AtjvaeGdR+8EW+d7w9ftvXUu0yKlbu227/wUUjZkmSprM3C55ecnd+bYydtVNClXRjnUmgJUABpzxEM36yyUrZ9IHKzYhdc25P+wR7US8MjBDZ/CR5rh9mLI6+a028e+t+t3I1nYSjNJvN5450QIsSV7Y8tp7OQpKr2sRcILeLedxFIKoPzqFK9HxRmddhbJ/xNIyu8iLaVIc+0H0w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MQ-0002hR-5P; Sun, 10 Nov 2024 05:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 13/31] 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: Sun, 10 Nov 2024 10:40:02 +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.173123515910151 (code B ref 74290); Sun, 10 Nov 2024 10:40:02 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:19 +0000 Received: from localhost ([127.0.0.1]:55761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Li-0002de-K8 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LQ-0002YA-8L for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:00 -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 1tA5LL-0007ou-2O; Sun, 10 Nov 2024 05:38:55 -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=rrWbjEpHoakMK4ZMrc/x /rps4G7/yjEU+UqV5UK1ur8UbwVeCNXW5L/Kx0NWUtKG0zQOt6MvFXk487YGNNbCUYwB5qU0OlxO2 axDpGbZwqn14J9GmQkhdzUxXdvif+VUIhpuMuiYEqBa13Ni3RkgOIa7WbsABVJZJFHzq8d8HRU4Od kdhROTJ+SjZltp9x4i8dzlBWL+a/fqtXC2Yyc5TUTT3c0POsv6VgFKj7dk5OuKsnlF7JwGLgCscTL DCQxQGpHKGKoKjPuvsJ+6/ly7CnYpgflXzg1KIM0CSm+eGgGytlNynDqQdeZS1Wtmw6oFhOc5AXaw pkghNkH6X3VvtQ==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:09 +0100 Message-ID: <7a8acd375aa807b7d4386ed8052aa743261c42ce.1731232753.git.janneke@gnu.org> 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"