Re: [PR PATCH] [Updated] gdb: fix musl patch.

[ericonr <ericonr@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1968 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages gdb
https://github.com/void-linux/void-packages/pull/29419

gdb: fix musl patch.
Use patch from Alpine. __SIGRTMIN and SIGRTMIN aren't the same thing:
SIGRTMIN is for signals applications can use, for which musl currently
returns 35, but __SIGRTMIN is supposed to include the signals that libc
uses, where the correct value is 32.

We also extend their patch to include the nostop changes from void,
though they don't seem to be explicitly doing something.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29419.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gdb-29419.patch --]
[-- Type: text/x-diff, Size: 3202 bytes --]

From fa658a49d15c24a97defa4b50f66096586459d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 12 Mar 2021 15:10:25 -0300
Subject: [PATCH] gdb: fix musl patch.

Use patch from Alpine. __SIGRTMIN and SIGRTMIN aren't the same thing:
SIGRTMIN is for signals applications can use, for which musl currently
returns 35, but __SIGRTMIN is supposed to include the signals that libc
uses, where the correct value is 32.

We also extend their patch to include the nostop changes from void,
though they don't seem to be explicitly doing something.
---
 srcpkgs/gdb/patches/gdb-linux_nat.patch | 21 ------------------
 srcpkgs/gdb/patches/gdb-signals.patch   | 29 +++++++++++++++++++++++++
 srcpkgs/gdb/template                    |  2 +-
 3 files changed, 30 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/gdb/patches/gdb-linux_nat.patch
 create mode 100644 srcpkgs/gdb/patches/gdb-signals.patch

diff --git a/srcpkgs/gdb/patches/gdb-linux_nat.patch b/srcpkgs/gdb/patches/gdb-linux_nat.patch
deleted file mode 100644
index 53f3132d36c..00000000000
--- a/srcpkgs/gdb/patches/gdb-linux_nat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-the first chunk fixes build errors,
-the non_stop part below fixes thread debugging being available
-by default without setting any breakpoints or usage of libthread_db.
-
---- gdb-7.4.org/gdb/linux-nat.c	2013-08-10 05:24:24.651000003 +0000
-+++ gdb-7.4/gdb/linux-nat.c	2013-08-10 05:25:50.966000003 +0000
-@@ -71,6 +71,14 @@
- # endif
- #endif /* HAVE_PERSONALITY */
- 
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN SIGRTMIN
-+#endif
-+
-+#ifndef W_STOPCODE
-+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
-+#endif
-+
- /* This comment documents high-level logic of this file.
- 
- Waiting for events in sync mode
diff --git a/srcpkgs/gdb/patches/gdb-signals.patch b/srcpkgs/gdb/patches/gdb-signals.patch
new file mode 100644
index 00000000000..9aef2b7251b
--- /dev/null
+++ b/srcpkgs/gdb/patches/gdb-signals.patch
@@ -0,0 +1,29 @@
+the first chunk fixes build errors,
+the non_stop part below fixes thread debugging being available
+by default without setting any breakpoints or usage of libthread_db.
+
+relevant bug:
+https://sourceware.org/bugzilla/show_bug.cgi?id=23616
+
+diff --git a/gdbsupport/signals.cc b/gdbsupport/signals.cc
+index 485e0f0..955aec1 100644
+--- a/gdbsupport/signals.cc
++++ b/gdbsupport/signals.cc
+@@ -31,6 +31,17 @@ struct gdbarch;
+    _available_ realtime signal, not the lowest supported; glibc takes
+    several for its own use.  */
+ 
++#ifndef __SIGRTMIN
++# define __SIGRTMIN 32
++#endif
++#ifndef __SIGRTMAX
++# define __SIGRTMAX _NSIG
++#endif
++
++#ifndef W_STOPCODE
++#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
++#endif
++
+ #ifndef REALTIME_LO
+ # if defined(__SIGRTMIN)
+ #  define REALTIME_LO __SIGRTMIN
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index e2a39e7d103..e63224696bd 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline