amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gdb: Fix build of target-specific versions.

Browse source 
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.

This patche 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.
* gnu/packages/gdb.scm (gdb-multiarch)[arguments]: Likewise.
* gnu/packages/gdb.scm (avr-gdb)[arguments]: Likewise.

Signed-off-by: Janneke Nieuwenhuizen <janneke@gnu.org>

Change-Id: Ia8748b86dc72197bd4eef307d091b6af44fc5611
This commit is contained in:
Rutherther via Guix-patches via 2024-12-11 20:35:45 +01:00 • committed by Janneke Nieuwenhuizen
parent 7aca60c6c4
commit 98908e0777
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
2 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/embedded.scm
View file

@ -741,12 +741,14 @@ languages are C and C++.")
(inherit gdb)
(name "gdb-arm-none-eabi")
(arguments
`(#:configure-flags '("--target=arm-none-eabi"
(substitute-keyword-arguments (package-arguments gdb)
((#:configure-flags flags '())
#~(cons* "--target=arm-none-eabi"
"--enable-multilib"
"--enable-interwork"
"--enable-languages=c,c++"
"--disable-nls")
,@(package-arguments gdb))))))
"--disable-nls"
#$flags)))))))
(define-public libjaylink
(package

20
gnu/packages/gdb.scm
View file

@ -184,14 +184,14 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
(package/inherit gdb-14
(name "gdb-multiarch")
(arguments
(append
(list #:configure-flags
#~(list "--enable-targets=all"
(substitute-keyword-arguments (package-arguments gdb-14)
((#:configure-flags flags '())
#~(cons* "--enable-targets=all"
"--enable-multilib"
"--enable-interwork"
"--enable-languages=c,c++"
"--disable-nls"))
(package-arguments gdb-14)))
"--disable-nls"
#$flags))))
(synopsis "The GNU debugger (with all architectures enabled)")))
(define-public gdb-minimal
@ -210,14 +210,14 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
(package/inherit gdb-14
(name "avr-gdb")
(arguments
(append
(list #:configure-flags
#~(list "--target=avr"
(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"))
(package-arguments gdb-14)))
"--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