[PR PATCH] gdb: enable multiarch by default and split

[PR PATCH] gdb: enable multiarch by default and split

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages temp
https://github.com/void-linux/void-packages/pull/50763

gdb: enable multiarch by default and split
#### Testing the changes
- I tested the changes in this PR: **briefly**

split to prevent `gdb` from being massive

cc @duncaen


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

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

From 84e8d41a4a5c59a25ba5fc1f04ffc8796e57ce55 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Jun 2024 13:02:27 -0400
Subject: [PATCH] gdb: enable multiarch by default and split

---
 srcpkgs/gdb-multiarch |  1 +
 srcpkgs/gdb/template  | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/gdb-multiarch

diff --git a/srcpkgs/gdb-multiarch b/srcpkgs/gdb-multiarch
new file mode 120000
index 00000000000000..f3e03e3f1a44b4
--- /dev/null
+++ b/srcpkgs/gdb-multiarch
@@ -0,0 +1 @@
+gdb
\ No newline at end of file
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index ccaed58523796f..ec39e27bbb8e1f 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=14.2
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline
@@ -19,8 +19,8 @@ checkdepends="dejagnu"
 short_desc="GNU Debugger"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
-changelog="https://sourceware.org/git/?p=binutils-gdb.git;a=blob_plain;f=gdb/NEWS;hb=HEAD"
 homepage="https://www.gnu.org/software/gdb"
+changelog="https://sourceware.org/git/?p=binutils-gdb.git;a=blob_plain;f=gdb/NEWS;hb=HEAD"
 distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
 checksum=2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772
 make_check=extended  # Tests take too long, not all of them pass.
@@ -44,10 +44,15 @@ build_options="debuginfod gdbserver guile multiarch python static"
 desc_option_gdbserver="Enable support for building GDB server"
 desc_option_debuginfod="Enable support for libdebuginfod"
 desc_option_multiarch="Enable support for all architectures"
-build_options_default="debuginfod gdbserver python"
+build_options_default="debuginfod gdbserver multiarch python"
 vopt_conflict gdbserver static
 vopt_conflict debuginfod static
 
+subpackages="gdb-common"
+if [ "$build_option_multiarch" ]; then
+	subpackages+=" gdb-multiarch"
+fi
+
 post_install() {
 	# resolve conflicts with binutils
 	rm -rf ${DESTDIR}/usr/{include,lib}
@@ -60,3 +65,12 @@ gdb-common_package() {
 		vmove usr/share
 	}
 }
+
+gdb-multiarch_package() {
+	short_desc+=" - all architectures"
+	#depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/run-*
+		vmove usr/bin/sis
+	}
+}

Re: [PR REVIEW] gdb: enable multiarch by default and split

[Duncaen]

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

New review comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/50763#discussion_r1633579773

Comment:
pattern should be quoted

Re: [PR REVIEW] gdb: enable multiarch by default and split

[Duncaen]

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

New review comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/50763#discussion_r1633579738

Comment:
This is commented out

Re: [PR PATCH] [Updated] gdb: enable multiarch by default and split

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages temp
https://github.com/void-linux/void-packages/pull/50763

gdb: enable multiarch by default and split
#### Testing the changes
- I tested the changes in this PR: **briefly**

split to prevent `gdb` from being massive

cc @duncaen


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

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

From ddcaa827e01ab9cd700f886933974c841f7e92b7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Jun 2024 13:02:27 -0400
Subject: [PATCH] gdb: enable multiarch by default and split

---
 srcpkgs/gdb-multiarch |  1 +
 srcpkgs/gdb/template  | 28 ++++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/gdb-multiarch

diff --git a/srcpkgs/gdb-multiarch b/srcpkgs/gdb-multiarch
new file mode 120000
index 00000000000000..f3e03e3f1a44b4
--- /dev/null
+++ b/srcpkgs/gdb-multiarch
@@ -0,0 +1 @@
+gdb
\ No newline at end of file
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index ccaed58523796f..7a7f66ed933d50 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=14.2
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline
@@ -19,8 +19,8 @@ checkdepends="dejagnu"
 short_desc="GNU Debugger"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
-changelog="https://sourceware.org/git/?p=binutils-gdb.git;a=blob_plain;f=gdb/NEWS;hb=HEAD"
 homepage="https://www.gnu.org/software/gdb"
+changelog="https://sourceware.org/git/?p=binutils-gdb.git;a=blob_plain;f=gdb/NEWS;hb=HEAD"
 distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
 checksum=2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772
 make_check=extended  # Tests take too long, not all of them pass.
@@ -48,10 +48,24 @@ build_options_default="debuginfod gdbserver python"
 vopt_conflict gdbserver static
 vopt_conflict debuginfod static
 
+if [ "$XBPS_WORDSIZE" -eq "$XBPS_TARGET_WORDSIZE" ]; then
+	build_options_default+=" multiarch"
+fi
+
+if [ "$build_option_multiarch" ]; then
+	if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
+		broken="run-cris link fails: undefined reference to bpf_match_insn etc"
+	fi
+	subpackages="gdb-multiarch"
+fi
+subpackages+=" gdb-common"
+
 post_install() {
 	# resolve conflicts with binutils
 	rm -rf ${DESTDIR}/usr/{include,lib}
 	rm -rf ${DESTDIR}/usr/share/info/{bfd,ctf-spec,sframe-spec}.info*
+	# resolve conflict with cross-arm-non-eabi-gdb
+	rm -rf ${DESTDIR}/usr/share/doc/{arm,erc32,frv,or1k,ppc,rx}
 }
 
 gdb-common_package() {
@@ -60,3 +74,13 @@ gdb-common_package() {
 		vmove usr/share
 	}
 }
+
+gdb-multiarch_package() {
+	short_desc+=" - all architectures"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/bin/run-*"
+		vmove usr/bin/sis
+		vmove usr/share/gdb/dtb
+	}
+}

Re: [PR PATCH] [Updated] gdb: enable multiarch by default and split

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages temp
https://github.com/void-linux/void-packages/pull/50763

gdb: enable multiarch by default and split
#### Testing the changes
- I tested the changes in this PR: **briefly**

split to prevent `gdb` from being massive

cc @duncaen


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

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

From 3c28e026ecf39a77e23a6ed740936eb8d76b09a5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Jun 2024 13:02:27 -0400
Subject: [PATCH] gdb: enable multiarch by default and split

---
 srcpkgs/gdb-multiarch |  1 +
 srcpkgs/gdb/template  | 28 ++++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/gdb-multiarch

diff --git a/srcpkgs/gdb-multiarch b/srcpkgs/gdb-multiarch
new file mode 120000
index 00000000000000..f3e03e3f1a44b4
--- /dev/null
+++ b/srcpkgs/gdb-multiarch
@@ -0,0 +1 @@
+gdb
\ No newline at end of file
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index ccaed58523796f..20903342e55e42 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=14.2
-revision=2
+revision=3
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline
@@ -19,8 +19,8 @@ checkdepends="dejagnu"
 short_desc="GNU Debugger"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
-changelog="https://sourceware.org/git/?p=binutils-gdb.git;a=blob_plain;f=gdb/NEWS;hb=HEAD"
 homepage="https://www.gnu.org/software/gdb"
+changelog="https://sourceware.org/git/?p=binutils-gdb.git;a=blob_plain;f=gdb/NEWS;hb=HEAD"
 distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz"
 checksum=2d4dd8061d8ded12b6c63f55e45344881e8226105f4d2a9b234040efa5ce7772
 make_check=extended  # Tests take too long, not all of them pass.
@@ -48,10 +48,24 @@ build_options_default="debuginfod gdbserver python"
 vopt_conflict gdbserver static
 vopt_conflict debuginfod static
 
+if [ "$XBPS_TARGET_WORDSIZE" -eq 64 ]; then
+	build_options_default+=" multiarch"
+fi
+
+if [ "$build_option_multiarch" ]; then
+	if [ "$XBPS_TARGET_WORDSIZE" -eq 32 ]; then
+		broken="run-cris link fails: undefined reference to bpf_match_insn etc"
+	fi
+	subpackages="gdb-multiarch"
+fi
+subpackages+=" gdb-common"
+
 post_install() {
 	# resolve conflicts with binutils
 	rm -rf ${DESTDIR}/usr/{include,lib}
 	rm -rf ${DESTDIR}/usr/share/info/{bfd,ctf-spec,sframe-spec}.info*
+	# resolve conflict with cross-arm-non-eabi-gdb
+	rm -rf ${DESTDIR}/usr/share/doc/{arm,erc32,frv,or1k,ppc,rx}
 }
 
 gdb-common_package() {
@@ -60,3 +74,13 @@ gdb-common_package() {
 		vmove usr/share
 	}
 }
+
+gdb-multiarch_package() {
+	short_desc+=" - all architectures"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/bin/run-*"
+		vmove usr/bin/sis
+		vmove usr/share/gdb/dtb
+	}
+}

Re: gdb: enable multiarch by default and split

[shaohme]

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

New comment by shaohme on void-packages repository

https://github.com/void-linux/void-packages/pull/50763#issuecomment-2159038479

Comment:
> #### Testing the changes
> 
>     * I tested the changes in this PR: **briefly**
> 
> 
> split to prevent `gdb` from being massive
> 
> cc @Duncaen

I've tried the branch out. It produces static linked run-* executables in /usr/bin, and seems to work.
Tried gdbserver a simple C program on a debian aarch64 system, and "target remote" from a x86-64 void system. Symbols are read and line stepping works too.

Re: gdb: enable multiarch by default and split

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/50763#issuecomment-2160429971

Comment:
disabled it on 32bit as it seems broken

Re: gdb: enable multiarch by default and split

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/50763#issuecomment-2160429971

Comment:
disabled it on 32bit as it seems broken (link errors for some bpf symbols) 

Re: gdb: enable multiarch by default and split

[shaohme]

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

New comment by shaohme on void-packages repository

https://github.com/void-linux/void-packages/pull/50763#issuecomment-2163619516

Comment:
> disabled it on 32bit as it seems broken (link errors for some bpf symbols)

Isn't that what the `archs="i686 x86_64"` is for?

Re: gdb: enable multiarch by default and split

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/50763#issuecomment-2163862787

Comment:
no, that would disable the entire gdb package

Re: [PR PATCH] [Merged]: gdb: enable multiarch by default and split

[classabbyamp]

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

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

gdb: enable multiarch by default and split
https://github.com/void-linux/void-packages/pull/50763

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

split to prevent `gdb` from being massive

cc @duncaen