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