From unknown Sat Aug 09 13:15:35 2025 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) From: Rutherther Date: Wed, 11 Dec 2024 20:35:45 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) 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(-) 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 base-commit: 27750bd0cddddab9e900f289a5520314ef66487e -- 2.46.0 From unknown Sat Aug 09 13:15:35 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74798] [PATCH] gnu: gdb: Ensure configure-flags are appended to original package Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Dec 2024 20:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74798@debbugs.gnu.org Cc: 74798-done@debbugs.gnu.org, Rutherther X-Debbugs-Original-To: Rutherther via Guix-patches via Received: via spool by submit@debbugs.gnu.org id=B.173394738311099 (code B ref -1); Wed, 11 Dec 2024 20:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Dec 2024 20:03:03 +0000 Received: from localhost ([127.0.0.1]:36349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLSvD-0002sM-Op for submit@debbugs.gnu.org; Wed, 11 Dec 2024 15:03:03 -0500 Received: from lists.gnu.org ([209.51.188.17]:47106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLSvA-0002s4-TR for submit@debbugs.gnu.org; Wed, 11 Dec 2024 15:02: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 1tLSvA-0005Dk-J9 for guix-patches@gnu.org; Wed, 11 Dec 2024 15:02:56 -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 1tLSv9-0002Bv-2N; Wed, 11 Dec 2024 15:02: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:Date:References:In-Reply-To:Subject:To: From; bh=i9GraQkcsOMIJWceekYOaU/g8/4ZKEeBurL2zpEkkgw=; b=niJPFQlBdgqc3B5yK0es cN40oE1PoooEobGLIRlyFR7GwqFajrmZxyEUfOd4tZHOOS9DPccmZs5qI44Z7VL9b9X5pr5thad0p 03ppf4XhZHm7lI4VmAiOb/rPyQL1J6J3hHojljQ8NTPVOsYuM2hhdoz0xQ8L1YqA+6L9uy5hwyCHl pLWFnTK5OqsNUF91Wi6nKmXzlwxsPqprkZJqY3oGy+PcL6qPHs45qXivW1TMndaABfx2MA0BoJCUg zX4yDIPa9fz5nNbxerhtZEsbJPEPSGoxAXnKOBf6KiMyKYUEibRRgiSmXeD8UbZkLqtgNzfzyypO7 NlRo7FaRCGu/ww==; From: Janneke Nieuwenhuizen In-Reply-To: (Rutherther via Guix-patches via's message of "Wed, 11 Dec 2024 20:35:45 +0100") Organization: AvatarAcademy.nl References: X-Url: http://AvatarAcademy.nl Date: Wed, 11 Dec 2024 21:02:49 +0100 Message-ID: <87msh22djq.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Rutherther via Guix-patches via writes: Hello, > 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 Thank you! And sorry for breaking things :) I've changed the commit message to --8<---------------cut here---------------start------------->8--- gnu: gdb: Fix build of target-specific variants. This is a follow-up to commit baf4a3330762d184f5b10846151a9e3afd7c3dbe gnu: Add gdb-15.2, with support for the 64bit Hurd. That commit changed the gdb package, introducing #:configure-flags, breaking three gdb packages, since they assumed there are no #:configure-flags in gd= b. That means they produced the same gdb as gdb-14. This patch fixes that by ensuring #:configure-flags are appended to original package. * gnu/packages/embedded.scm (make-gdb-arm-none-eabi)[arguments]: Append #configure-flags to original flags. (gdb-multiarch)[arguments]: Likewise. (avr-gdb)[arguments]: Likewise. --8<---------------cut here---------------end--------------->8--- and pushed to master as 98908e0777889aeec2796dbdc4f0809a1898dd3b. Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Sat Aug 09 13:15:35 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Rutherther Subject: bug#74798: closed (Re: [bug#74798] [PATCH] gnu: gdb: Ensure configure-flags are appended to original package) Message-ID: References: <87msh22djq.fsf@gnu.org> X-Gnu-PR-Message: they-closed 74798 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 74798@debbugs.gnu.org Date: Wed, 11 Dec 2024 20:04:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1733947443-11418-1" This is a multi-part message in MIME format... ------------=_1733947443-11418-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #74798: [PATCH] gnu: gdb: Ensure configure-flags are appended to original p= ackage which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 74798@debbugs.gnu.org. --=20 74798: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74798 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1733947443-11418-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 74798-done) by debbugs.gnu.org; 11 Dec 2024 20:03:07 +0000 Received: from localhost ([127.0.0.1]:36353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLSvK-0002tf-HL for submit@debbugs.gnu.org; Wed, 11 Dec 2024 15:03:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tLSvF-0002s1-Hg for 74798-done@debbugs.gnu.org; Wed, 11 Dec 2024 15:03:04 -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 1tLSv9-0002Bv-2N; Wed, 11 Dec 2024 15:02: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:Date:References:In-Reply-To:Subject:To: From; bh=i9GraQkcsOMIJWceekYOaU/g8/4ZKEeBurL2zpEkkgw=; b=niJPFQlBdgqc3B5yK0es cN40oE1PoooEobGLIRlyFR7GwqFajrmZxyEUfOd4tZHOOS9DPccmZs5qI44Z7VL9b9X5pr5thad0p 03ppf4XhZHm7lI4VmAiOb/rPyQL1J6J3hHojljQ8NTPVOsYuM2hhdoz0xQ8L1YqA+6L9uy5hwyCHl pLWFnTK5OqsNUF91Wi6nKmXzlwxsPqprkZJqY3oGy+PcL6qPHs45qXivW1TMndaABfx2MA0BoJCUg zX4yDIPa9fz5nNbxerhtZEsbJPEPSGoxAXnKOBf6KiMyKYUEibRRgiSmXeD8UbZkLqtgNzfzyypO7 NlRo7FaRCGu/ww==; From: Janneke Nieuwenhuizen To: Rutherther via Guix-patches via Subject: Re: [bug#74798] [PATCH] gnu: gdb: Ensure configure-flags are appended to original package In-Reply-To: (Rutherther via Guix-patches via's message of "Wed, 11 Dec 2024 20:35:45 +0100") Organization: AvatarAcademy.nl References: X-Url: http://AvatarAcademy.nl Date: Wed, 11 Dec 2024 21:02:49 +0100 Message-ID: <87msh22djq.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74798-done Cc: 74798-done@debbugs.gnu.org, Rutherther X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Rutherther via Guix-patches via writes: Hello, > 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 Thank you! And sorry for breaking things :) I've changed the commit message to --8<---------------cut here---------------start------------->8--- gnu: gdb: Fix build of target-specific variants. This is a follow-up to commit baf4a3330762d184f5b10846151a9e3afd7c3dbe gnu: Add gdb-15.2, with support for the 64bit Hurd. That commit changed the gdb package, introducing #:configure-flags, breaking three gdb packages, since they assumed there are no #:configure-flags in gd= b. That means they produced the same gdb as gdb-14. This patch fixes that by ensuring #:configure-flags are appended to original package. * gnu/packages/embedded.scm (make-gdb-arm-none-eabi)[arguments]: Append #configure-flags to original flags. (gdb-multiarch)[arguments]: Likewise. (avr-gdb)[arguments]: Likewise. --8<---------------cut here---------------end--------------->8--- and pushed to master as 98908e0777889aeec2796dbdc4f0809a1898dd3b. Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com ------------=_1733947443-11418-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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) From: Rutherther To: guix-patches@gnu.org Subject: [PATCH] gnu: gdb: Ensure configure-flags are appended to original package Date: Wed, 11 Dec 2024 20:35:45 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Rutherther X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) 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(-) 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 base-commit: 27750bd0cddddab9e900f289a5520314ef66487e -- 2.46.0 ------------=_1733947443-11418-1--