From patchwork Wed Dec 11 19:35:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 34800 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 5B49B27BBEA; Wed, 11 Dec 2024 19:36:24 +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=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, 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 A90A527BBE2 for ; Wed, 11 Dec 2024 19:36:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLSVA-0002Lb-7A; Wed, 11 Dec 2024 14:36: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 1tLSV8-0002KO-NT for guix-patches@gnu.org; Wed, 11 Dec 2024 14:36: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 1tLSV8-0007Sz-Ec for guix-patches@gnu.org; Wed, 11 Dec 2024 14:36: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:Date:From:To:Subject; bh=d+BsfBumbXPOzEx+BPlXhBspoK2X6DII93srfBeFopw=; b=sh7ztzcezFbmrevAMZwuZdJS5Vs0oe66u7RaL1/5+gc+udcTYhYLDyV6KD8alN8Fq2RZ460wH2Eb4iaq6nTTicxu6QMr2klrQb0iF4lIb1O5hmpeINO4lfNM/yY+L13szgEmcGqZ4YpqE0MUaSE6rbrlywmJptiBom7f5zxfDXhfMbgTFkJgPdurHyVNY2tcS4Xbw65ernXJZ3wqKNXlur6ijEBmov7O27wNv7rFx0ROixNbhvCr+h6NbOpwqB2S2qeC1y/K/+5rkV4YX26b9xx02nl9Nx0BOl+nbC6dhMmSwFUGuZy5zSioKmkHdz+WF05YmGz7QF7YgMM/WwpLfQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tLSV8-0000vE-19 for guix-patches@gnu.org; Wed, 11 Dec 2024 14:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74798] [PATCH] gnu: gdb: Ensure configure-flags are appended to original package Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Dec 2024 19:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74798@debbugs.gnu.org Cc: Rutherther X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17339457613540 (code B ref -1); Wed, 11 Dec 2024 19:36:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Dec 2024 19:36:01 +0000 Received: from localhost ([127.0.0.1]:36306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLSV6-0000ux-TG for submit@debbugs.gnu.org; Wed, 11 Dec 2024 14:36:01 -0500 Received: from lists.gnu.org ([209.51.188.17]:41038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLSV3-0000um-SC for submit@debbugs.gnu.org; Wed, 11 Dec 2024 14:35:58 -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 1tLSV3-0002JR-E8 for guix-patches@gnu.org; Wed, 11 Dec 2024 14:35:57 -0500 Received: from ditigal.xyz ([78.46.201.50] helo=mail.ditigal.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1tLSV1-0007SO-NS for guix-patches@gnu.org; Wed, 11 Dec 2024 14:35:57 -0500 Received: by cerebrum (OpenSMTPD) with ESMTPSA id 275ea6de (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 11 Dec 2024 19:35:51 +0000 (UTC) Date: Wed, 11 Dec 2024 20:35:45 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ditigal.xyz; i=@ditigal.xyz; q=dns/txt; s=20240917; t=1733945751; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : from; bh=ODSEw6tDX50A1BQMdTzYV8tkf7tZk9fq3eBmuLLcyek=; b=By2rlBdAEtWn2JHb6++u5j51qdb9Se0bbyBi9A3bCH2e0iA4wZKMr+qyve7F8ot36WIHn pSHG4Yp0CFaAf2yhkkEkiomJ/sW3GCQMt81heT4dT76agqznqb+puK8k4GyS+vCkSPKAHBm xH4vfiUjND81sQlq6fhPkG89nIGVAi0= Received-SPF: pass client-ip=78.46.201.50; envelope-from=rutherther@ditigal.xyz; helo=mail.ditigal.xyz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Rutherther X-ACL-Warn: , Rutherther via Guix-patches X-Patchwork-Original-From: Rutherther via Guix-patches via From: Rutherther 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 Since recently there has been a change to gdb package that introduced configure-flags, three gdb packages broke, since they assumed there are no configure-flags in gdb. That means they produced the same gdb as gdb-14. * gnu/packages/embedded.scm (make-gdb-arm-none-eabi)[arguments]: Append configure-flags to original flags. * gnu/packages/gdb.scm (gdb-multiarch)[arguments]: Append configure-flags to original flags. * gnu/packages/gdb.scm (avr-gdb)[arguments]: Append configure-flags to original flags. Change-Id: Ia8748b86dc72197bd4eef307d091b6af44fc5611 --- gnu/packages/embedded.scm | 14 ++++++++------ gnu/packages/gdb.scm | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 22 deletions(-) base-commit: 27750bd0cddddab9e900f289a5520314ef66487e diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 0dcfc6669f..930857d0aa 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -741,12 +741,14 @@ (define make-gdb-arm-none-eabi (inherit gdb) (name "gdb-arm-none-eabi") (arguments - `(#:configure-flags '("--target=arm-none-eabi" - "--enable-multilib" - "--enable-interwork" - "--enable-languages=c,c++" - "--disable-nls") - ,@(package-arguments gdb)))))) + (substitute-keyword-arguments (package-arguments gdb) + ((#:configure-flags flags '()) + #~(cons* "--target=arm-none-eabi" + "--enable-multilib" + "--enable-interwork" + "--enable-languages=c,c++" + "--disable-nls" + #$flags))))))) (define-public libjaylink (package diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index af5ebde3f6..ef100306b4 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -184,14 +184,14 @@ (define-public gdb-multiarch (package/inherit gdb-14 (name "gdb-multiarch") (arguments - (append - (list #:configure-flags - #~(list "--enable-targets=all" - "--enable-multilib" - "--enable-interwork" - "--enable-languages=c,c++" - "--disable-nls")) - (package-arguments gdb-14))) + (substitute-keyword-arguments (package-arguments gdb-14) + ((#:configure-flags flags '()) + #~(cons* "--enable-targets=all" + "--enable-multilib" + "--enable-interwork" + "--enable-languages=c,c++" + "--disable-nls" + #$flags)))) (synopsis "The GNU debugger (with all architectures enabled)"))) (define-public gdb-minimal @@ -210,14 +210,14 @@ (define-public avr-gdb (package/inherit gdb-14 (name "avr-gdb") (arguments - (append - (list #:configure-flags - #~(list "--target=avr" - "--disable-nls" - "--enable-languages=c,c++" - "--with-system-readline" - "--enable-source-highlight")) - (package-arguments gdb-14))) + (substitute-keyword-arguments (package-arguments gdb-14) + ((#:configure-flags flags '()) + #~(cons* "--target=avr" + "--disable-nls" + "--enable-languages=c,c++" + "--with-system-readline" + "--enable-source-highlight" + #$flags)))) (synopsis "The GNU Debugger for AVR") (description "GDB is the GNU debugger. With it, you can monitor what a program is