diff options
author | Ludovic Courtès <ludo@gnu.org> | 2023-04-18 15:49:14 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2023-04-18 15:52:02 +0200 |
commit | 664a222cac862665267f9bc69f1db1ec1a2238d5 (patch) | |
tree | 4beb70703b0ee7f9896eb4250c701f7310506342 /gnu/packages/gdb.scm | |
parent | b49fd5daabefe7e89a839b03d8acd90e95c4275f (diff) | |
download | guix-664a222cac862665267f9bc69f1db1ec1a2238d5.tar.gz guix-664a222cac862665267f9bc69f1db1ec1a2238d5.zip |
gnu: gdb: Remove Hurd patch.
The patch was useful for GDB 11 on the previous Hurd version that was
used; it's unnecessary on GDB 12 and GDB 11 has other build issues on
the current GNU/Hurd.
This change fixes "guix build gdb-minimal --target=i586-pc-gnu".
* gnu/packages/patches/gdb-fix-gnu-nat-build.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/gdb.scm (gdb-11)[arguments]: Remove 'patch-gdb/hurd' phase.
[inputs]: Remove "hurd-build.patch" input.
[supported-systems]: New field.
(gdb-12)[supported-systems]: New field.
Diffstat (limited to 'gnu/packages/gdb.scm')
-rw-r--r-- | gnu/packages/gdb.scm | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 493b30f841..b9fbf1480a 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -72,12 +72,6 @@ "gdbsupport/pathstuff.cc") (("\"/bin/sh\"") (format #f "~s" sh)))))) - ,@(if (hurd-target?) - '((add-after 'unpack 'patch-gdb/hurd - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch (assoc-ref inputs "hurd-build.patch"))) - (invoke "patch" "-p1" "--force" "-i" patch))))) - '()) (add-after 'configure 'post-configure (lambda _ (for-each patch-makefile-SHELL @@ -119,9 +113,7 @@ ;; The Hurd needs -lshouldbeinlibc. ,@(if (hurd-target?) - `(("hurd" ,hurd) - ("hurd-build.patch" - ,(search-patch "gdb-fix-gnu-nat-build.patch"))) + `(("hurd" ,hurd)) '()))) (native-inputs `(("texinfo" ,texinfo) @@ -148,7 +140,11 @@ doing while it runs or what it was doing just before a crash. It allows you to specify the runtime conditions, to define breakpoints, and to change how the program is running to try to fix bugs. It can be used to debug programs written in C, C++, Ada, Objective-C, Pascal and more.") - (license gpl3+))) + (license gpl3+) + + ;; GDB 11 now fails to build on GNU/Hurd (undefined references to process + ;; RPC stubs). + (supported-systems (fold delete %supported-systems %hurd-systems)))) (define-public gdb-12 (package @@ -160,7 +156,10 @@ written in C, C++, Ada, Objective-C, Pascal and more.") version ".tar.xz")) (sha256 (base32 - "1vczsqcbh5y0gx7qrclpna0qzx26sk7lra6y8qzxam1biyzr65qf")))))) + "1vczsqcbh5y0gx7qrclpna0qzx26sk7lra6y8qzxam1biyzr65qf")))) + + ;; GDB 12 builds fine on GNU/Hurd. + (supported-systems %supported-systems))) (define-public gdb ;; This is the fixed version that packages depend on. Update it rarely |