[PR PATCH] gdb: add multiarch build option

[PR PATCH] gdb: add multiarch build option

[Piraty]

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

There is a new pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages gdb-multiarch
https://github.com/void-linux/void-packages/pull/30497

gdb: add multiarch build option
#### Have the results of the proposed changes been tested?
- [x] 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



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

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

From 1075fbd34597adde110492a6a8f01003dbf17b9d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 12 Apr 2021 22:12:45 +0200
Subject: [PATCH] gdb: add multiarch build option

---
 srcpkgs/gdb/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 64787a9ade34..7fc3d0288efe 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,11 +1,12 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=3
+revision=4
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline
- --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
+ --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib
+ $(vopt_enable gdbserver) $(vopt_if multiarch --enable-targets=all)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
@@ -30,13 +31,13 @@ fi
 CFLAGS+=" -fcommon"
 CXXFLAGS+=" -fcommon"
 # Package build options
-build_options="gdbserver static python debuginfod"
-desc_option_gdbserver="Enable support for building GDB server"
+build_options="gdbserver multiarch static python debuginfod"
 desc_option_debuginfod="Enable support for libdebuginfod"
-# Enable gdbserver if !static.
+desc_option_multiarch="Enable support for all architectures"
+desc_option_gdbserver="Enable support for building GDB server"
 build_options_default="gdbserver python debuginfod"
-# Both options cannot be enabled at the same time
 vopt_conflict gdbserver static
+vopt_conflict debuginfod static
 
 post_extract() {
 	vsed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c

Re: [PR PATCH] [Updated] gdb: add multiarch build option

[Piraty]

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

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

https://github.com/Piraty/void-packages gdb-multiarch
https://github.com/void-linux/void-packages/pull/30497

gdb: add multiarch build option
#### Have the results of the proposed changes been tested?
- [x] 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



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

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

From a948eb2c3244302deb3e5699f9b421a59fd5ef40 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 12 Apr 2021 22:12:45 +0200
Subject: [PATCH] gdb: add multiarch build option

---
 srcpkgs/gdb/template | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 64787a9ade34..7b302ad7331b 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,11 +1,12 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=3
+revision=4
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline
- --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
+ --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib
+ $(vopt_enable gdbserver) $(vopt_if multiarch --enable-targets=all)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
@@ -27,16 +28,14 @@ if [ "${CROSS_BUILD}" ]; then
 	CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
 	CXXFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
 fi
-CFLAGS+=" -fcommon"
-CXXFLAGS+=" -fcommon"
-# Package build options
-build_options="gdbserver static python debuginfod"
-desc_option_gdbserver="Enable support for building GDB server"
+
+build_options="gdbserver multiarch static python debuginfod"
 desc_option_debuginfod="Enable support for libdebuginfod"
-# Enable gdbserver if !static.
+desc_option_multiarch="Enable support for all architectures"
+desc_option_gdbserver="Enable support for building GDB server"
 build_options_default="gdbserver python debuginfod"
-# Both options cannot be enabled at the same time
 vopt_conflict gdbserver static
+vopt_conflict debuginfod static
 
 post_extract() {
 	vsed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c

Re: gdb: add multiarch build option

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30497#issuecomment-826997457

Comment:
Is this an RFC for enabling it by default as well?

Re: gdb: add multiarch build option

[Piraty]

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

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/30497#issuecomment-827062138

Comment:
could be, do you think it's useful enough for everyone else to waste additional 24M on their machines? ;)

Re: gdb: add multiarch build option

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30497#issuecomment-827069306

Comment:
I feel like multiarch `binutils` by default can be more useful than this one, since remote debugging isn't exactly that common... I do use `cross-arm-none-eabi-gdb` here (which idk if this even replaces, since that's not a hosted platform), but I don't think I'm in the majority.

At least for now, might be better to keep it disabled by default.

Re: gdb: add multiarch build option

[Piraty]

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

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/30497#issuecomment-827100589

Comment:
I used it to debug an aarch64 binary on my x86 host (with help of `qemu -g`) so it was helpful to me at least.

Re: [PR PATCH] [Merged]: gdb: add multiarch build option

[Piraty]

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

There's a merged pull request on the void-packages repository

gdb: add multiarch build option
https://github.com/void-linux/void-packages/pull/30497

Description:
#### Have the results of the proposed changes been tested?
- [x] 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