apteryx pushed a commit to branch core-updates-frozen-batched-changes in repository guix.
commit 4b8138be326b2cf8d805962ca2ddbe8642c22d5f Author: Maxim Cournoyer <[email protected]> AuthorDate: Wed Oct 27 23:53:13 2021 -0400 gnu: gdb: Update to 11.1. * gnu/packages/gdb.scm (gdb-10): Rename to... (gdb-11): ... and update. Update comment about disabled tests. [origin]: Delete patch, integrated upstream. (gdb-9.2): Inherit from gdb-11. (gdb): Set alias to gdb-11. * gnu/packages/patches/gdb-hurd.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - gnu/packages/gdb.scm | 20 ++++++++------------ gnu/packages/patches/gdb-hurd.patch | 30 ------------------------------ 3 files changed, 8 insertions(+), 43 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index ad0093c..fd635a0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1126,7 +1126,6 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-8-strmov-store-file-names.patch \ %D%/packages/patches/gcc-9-asan-fix-limits-include.patch \ %D%/packages/patches/gcc-9-strmov-store-file-names.patch \ - %D%/packages/patches/gdb-hurd.patch \ %D%/packages/patches/gdb-9.2-sim-ppc-fno-common.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 4b1d600..34e1b78 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -43,24 +43,21 @@ #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (srfi srfi-1)) -(define-public gdb-10 +(define-public gdb-11 (package (name "gdb") - (version "10.2") + (version "11.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz")) (sha256 (base32 - "0aag1c0fw875pvhjg1qp7x8pf6gf92bjv5gcic5716scacyj58da")) - (patches - (search-patches "gdb-hurd.patch")))) - + "151z6d0265hv9cgx9zqqa4bd6vbp20hrljhd6bxl7lr0gd0crkyc")))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments - `(#:tests? #f ; FIXME "make check" fails on single-processor systems. + `(#:tests? #f ;FIXME: 217 unexpected failures #:out-of-source? #t #:modules ((srfi srfi-1) ,@%gnu-build-system-modules) @@ -141,11 +138,10 @@ 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+))) -;; This version of GDB is required by some of the Rust compilers, see -;; <https://github.com/rust-lang/rust/issues/79009>. +;;; Kept for LDC; recent GDB have regressions with the D languages. (define-public gdb-9.2 (package - (inherit gdb-10) + (inherit gdb-11) (version "9.2") (source (origin (method url-fetch) @@ -157,12 +153,12 @@ written in C, C++, Ada, Objective-C, Pascal and more.") "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n")))) (inputs (alist-replace "guile" (list guile-2.0) - (package-inputs gdb-10))))) + (package-inputs gdb-11))))) (define-public gdb ;; This is the fixed version that packages depend on. Update it rarely ;; enough to avoid massive rebuilds. - gdb-10) + gdb-11) (define-public gdb-minimal (package/inherit gdb diff --git a/gnu/packages/patches/gdb-hurd.patch b/gnu/packages/patches/gdb-hurd.patch deleted file mode 100644 index c4763ce..0000000 --- a/gnu/packages/patches/gdb-hurd.patch +++ /dev/null @@ -1,30 +0,0 @@ -Taken from upstream. - -From dca11eb872c96f86388890b3750e450cc2a68700 Mon Sep 17 00:00:00 2001 -From: Samuel Thibault <[email protected]> -Date: Mon, 21 Dec 2020 16:01:07 +0000 -Subject: [PATCH] hurd: Fix getting VM_MIN/MAX_ADDRESS - -gnu-nat.c was getting the inclusion of vm_param.h only by luck. We need -to explicitly include it to be sure to get the definitions of -VM_MIN/MAX_ADDRESS. - -gdb/ChangeLog: - - * gnu-nat.c: Include <mach/vm_param.h>. ---- - gdb/gnu-nat.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c -index 1693ce0c43d..6f290be0d51 100644 ---- a/gdb/gnu-nat.c -+++ b/gdb/gnu-nat.c -@@ -32,6 +32,7 @@ extern "C" - #include <mach/message.h> - #include <mach/notify.h> - #include <mach/vm_attributes.h> -+#include <mach/vm_param.h> - - #include <hurd.h> - #include <hurd/interrupt.h>
