From 84e8d41a4a5c59a25ba5fc1f04ffc8796e57ce55 Mon Sep 17 00:00:00 2001 From: classabbyamp 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 " 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 + } +}