From 94adcb1fe903a162c411f807eda6f33d4d6a5724 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 28 Apr 2025 07:12:49 +0000
Subject: [PATCH] dev-debug/gdb: Sync with Gentoo

It's from Gentoo commit fb2d045c4314f0b112e463f053f6e5a9ac2770c4.
---
 .../portage-stable/dev-debug/gdb/Manifest     |  1 +
 .../dev-debug/gdb/gdb-15.2-r103.ebuild        |  5 ++-
 .../dev-debug/gdb/gdb-16.2-r2.ebuild          | 29 ++++++---------
 .../{gdb-15.2-r100.ebuild => gdb-16.3.ebuild} | 37 ++++++++++++-------
 .../dev-debug/gdb/gdb-9999.ebuild             | 29 ++++++---------
 5 files changed, 52 insertions(+), 49 deletions(-)
 rename sdk_container/src/third_party/portage-stable/dev-debug/gdb/{gdb-15.2-r100.ebuild => gdb-16.3.ebuild} (89%)

diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/Manifest b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/Manifest
index 7536e0f048..48e5b62065 100644
--- a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/Manifest
@@ -1,2 +1,3 @@
 DIST gdb-15.2.tar.xz 24332820 BLAKE2B 073668c21b41f12bf40160c6d3df808056453cc9df3b5b86374abe38e955d208f86467458b7e64b3c3e93d70b7f87425619778173fdb375256cd85be15419f14 SHA512 624007deceb5b15ba89c0725883d1a699fa46714ef30887f3d0165e17c5d65d634671740a135aa69e437d916218abb08cfa2a38ed309ff19d48f51da56b2a8ba
 DIST gdb-16.2.tar.xz 24426680 BLAKE2B 480cc5c116e418d7eb13a68bee8a2ced8e7a40bd38826dde3590a8d5b690c3dd46be6fa3790518b39ac7255698a1ecf35a2bb51d7e38d849f7b9277c15fe38fc SHA512 f04a6335dbdee371edb7e3213294fcbb878ac39adedb73f7e17e621f54350488f5f5bea9bc742639239c122d590bed158771a74fc3aaeaa7fa0ae304232576a3
+DIST gdb-16.3.tar.xz 24434444 BLAKE2B a75c8655b39580a7f6e0d85ef663f60932fbed9a92ade6d58a2e99bc8b1416b36f8410c66c23bdada83e221a65c1cdfdeb7bb7ae9a930c443557864a1769dbee SHA512 fffd6689c3405466a179670b04720dc825e4f210a761f63dd2b33027432f8cd5d1c059c431a5ec9e165eedd1901220b5329d73c522f9a444788888c731b29e9c
diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-15.2-r103.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-15.2-r103.ebuild
index 37ff9d538b..76a96b72a2 100644
--- a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-15.2-r103.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-15.2-r103.ebuild
@@ -75,7 +75,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="babeltrace cet debuginfod guile lzma multitarget nls +python rocm +server sim source-highlight test vanilla xml xxhash zstd"
 if [[ -n ${REGULAR_RELEASE} ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 REQUIRED_USE="
 	guile? ( ${GUILE_REQUIRED_USE} )
@@ -84,13 +84,14 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
+# <babeltrace-2: bug #951652
 RDEPEND="
 	dev-libs/mpfr:=
 	dev-libs/gmp:=
 	>=sys-libs/ncurses-5.2-r2:=
 	>=sys-libs/readline-7:=
 	sys-libs/zlib
-	babeltrace? ( dev-util/babeltrace:= )
+	babeltrace? ( dev-util/babeltrace:0/1 )
 	debuginfod? (
 		dev-libs/elfutils[debuginfod(-)]
 	)
diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-16.2-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-16.2-r2.ebuild
index 94a55473c3..e3015bdaa8 100644
--- a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-16.2-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-16.2-r2.ebuild
@@ -88,13 +88,14 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
+# <babeltrace-2: bug #951652
 RDEPEND="
 	dev-libs/mpfr:=
 	dev-libs/gmp:=
 	>=sys-libs/ncurses-5.2-r2:=
 	>=sys-libs/readline-7:=
 	sys-libs/zlib
-	babeltrace? ( dev-util/babeltrace:= )
+	babeltrace? ( dev-util/babeltrace:0/1 )
 	debuginfod? (
 		dev-libs/elfutils[debuginfod(-)]
 	)
@@ -134,14 +135,16 @@ PATCHES=(
 pkg_setup() {
 	local CONFIG_CHECK
 
-	if kernel_is -ge 6.11.3 ; then
-		# https://forums.gentoo.org/viewtopic-p-8846891.html
-		#
-		# Either CONFIG_PROC_MEM_ALWAYS_FORCE or CONFIG_PROC_MEM_FORCE_PTRACE
-		# should be okay, but not CONFIG_PROC_MEM_NO_FORCE.
-		CONFIG_CHECK+="
-			~!PROC_MEM_NO_FORCE
-		"
+	if [[ ${CHOST} == *-linux-* ]] ; then
+		if kernel_is -ge 6.11.3 ; then
+			# https://forums.gentoo.org/viewtopic-p-8846891.html
+			#
+			# Either CONFIG_PROC_MEM_ALWAYS_FORCE or CONFIG_PROC_MEM_FORCE_PTRACE
+			# should be okay, but not CONFIG_PROC_MEM_NO_FORCE.
+			CONFIG_CHECK+="
+				~!PROC_MEM_NO_FORCE
+			"
+		fi
 	fi
 
 	linux-info_pkg_setup
@@ -160,14 +163,6 @@ src_prepare() {
 	# Avoid using ancient termcap from host on Prefix systems
 	sed -i -e 's/termcap tinfow/tinfow/g' \
 		gdb/configure{.ac,} || die
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# code relies on C++11, so make sure we get that selected
-		# due to Python 3.11 pymacro.h doing stuff to work around
-		# versioning mess based on the C version, while we're compiling
-		# C++ here, so we need to make it clear we're doing C++11/C11
-		# because Solaris system headers act on these
-		sed -i -e 's/-x c++/-std=c++11/' gdb/Makefile.in || die
-	fi
 }
 
 gdb_branding() {
diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-15.2-r100.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-16.3.ebuild
similarity index 89%
rename from sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-15.2-r100.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-16.3.ebuild
index 84b680ba31..e3015bdaa8 100644
--- a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-15.2-r100.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-16.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,11 @@ is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 case ${PV} in
 	9999*)
 		# live git tree
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		EGIT_REPO_URI="
+			https://sourceware.org/git/binutils-gdb.git
+			https://git.sr.ht/~sourceware/binutils-gdb
+			https://gitlab.com/x86-binutils/binutils-gdb.git
+		"
 		inherit git-r3
 		SRC_URI=""
 		;;
@@ -73,23 +77,25 @@ SRC_URI="
 
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
-IUSE="cet debuginfod guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
+IUSE="babeltrace cet debuginfod guile lzma multitarget nls +python rocm +server sim source-highlight test vanilla xml xxhash zstd"
 if [[ -n ${REGULAR_RELEASE} ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 REQUIRED_USE="
 	guile? ( ${GUILE_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
+	rocm? ( multitarget )
 "
 RESTRICT="!test? ( test )"
 
+# <babeltrace-2: bug #951652
 RDEPEND="
 	dev-libs/mpfr:=
 	dev-libs/gmp:=
 	>=sys-libs/ncurses-5.2-r2:=
 	>=sys-libs/readline-7:=
 	sys-libs/zlib
-	elibc_glibc? ( net-libs/libnsl:= )
+	babeltrace? ( dev-util/babeltrace:0/1 )
 	debuginfod? (
 		dev-libs/elfutils[debuginfod(-)]
 	)
@@ -97,6 +103,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	guile? ( ${GUILE_DEPS} )
 	xml? ( dev-libs/expat )
+	rocm? ( >=dev-libs/rocdbgapi-6.3 )
 	source-highlight? (
 		dev-util/source-highlight
 	)
@@ -128,14 +135,16 @@ PATCHES=(
 pkg_setup() {
 	local CONFIG_CHECK
 
-	if kernel_is -ge 6.11.3 ; then
-		# https://forums.gentoo.org/viewtopic-p-8846891.html
-		#
-		# Either CONFIG_PROC_MEM_ALWAYS_FORCE or CONFIG_PROC_MEM_FORCE_PTRACE
-		# should be okay, but not CONFIG_PROC_MEM_NO_FORCE.
-		CONFIG_CHECK+="
-			~!PROC_MEM_NO_FORCE
-		"
+	if [[ ${CHOST} == *-linux-* ]] ; then
+		if kernel_is -ge 6.11.3 ; then
+			# https://forums.gentoo.org/viewtopic-p-8846891.html
+			#
+			# Either CONFIG_PROC_MEM_ALWAYS_FORCE or CONFIG_PROC_MEM_FORCE_PTRACE
+			# should be okay, but not CONFIG_PROC_MEM_NO_FORCE.
+			CONFIG_CHECK+="
+				~!PROC_MEM_NO_FORCE
+			"
+		fi
 	fi
 
 	linux-info_pkg_setup
@@ -189,6 +198,7 @@ src_configure() {
 		# Disable modules that are in a combined binutils/gdb tree. bug #490566
 		--disable-{binutils,etc,gas,gold,gprof,gprofng,ld}
 
+		$(use_with babeltrace)
 		$(use_with debuginfod)
 
 		$(use_enable test unit-tests)
@@ -231,6 +241,7 @@ src_configure() {
 		--without-zlib
 		--with-system-zlib
 		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+		--with-amd-dbgapi=$(usex rocm)
 		$(use_with xml expat)
 		$(use_with lzma)
 		$(use_enable nls)
diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-9999.ebuild
index 94a55473c3..e3015bdaa8 100644
--- a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-9999.ebuild
@@ -88,13 +88,14 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
+# <babeltrace-2: bug #951652
 RDEPEND="
 	dev-libs/mpfr:=
 	dev-libs/gmp:=
 	>=sys-libs/ncurses-5.2-r2:=
 	>=sys-libs/readline-7:=
 	sys-libs/zlib
-	babeltrace? ( dev-util/babeltrace:= )
+	babeltrace? ( dev-util/babeltrace:0/1 )
 	debuginfod? (
 		dev-libs/elfutils[debuginfod(-)]
 	)
@@ -134,14 +135,16 @@ PATCHES=(
 pkg_setup() {
 	local CONFIG_CHECK
 
-	if kernel_is -ge 6.11.3 ; then
-		# https://forums.gentoo.org/viewtopic-p-8846891.html
-		#
-		# Either CONFIG_PROC_MEM_ALWAYS_FORCE or CONFIG_PROC_MEM_FORCE_PTRACE
-		# should be okay, but not CONFIG_PROC_MEM_NO_FORCE.
-		CONFIG_CHECK+="
-			~!PROC_MEM_NO_FORCE
-		"
+	if [[ ${CHOST} == *-linux-* ]] ; then
+		if kernel_is -ge 6.11.3 ; then
+			# https://forums.gentoo.org/viewtopic-p-8846891.html
+			#
+			# Either CONFIG_PROC_MEM_ALWAYS_FORCE or CONFIG_PROC_MEM_FORCE_PTRACE
+			# should be okay, but not CONFIG_PROC_MEM_NO_FORCE.
+			CONFIG_CHECK+="
+				~!PROC_MEM_NO_FORCE
+			"
+		fi
 	fi
 
 	linux-info_pkg_setup
@@ -160,14 +163,6 @@ src_prepare() {
 	# Avoid using ancient termcap from host on Prefix systems
 	sed -i -e 's/termcap tinfow/tinfow/g' \
 		gdb/configure{.ac,} || die
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# code relies on C++11, so make sure we get that selected
-		# due to Python 3.11 pymacro.h doing stuff to work around
-		# versioning mess based on the C version, while we're compiling
-		# C++ here, so we need to make it clear we're doing C++11/C11
-		# because Solaris system headers act on these
-		sed -i -e 's/-x c++/-std=c++11/' gdb/Makefile.in || die
-	fi
 }
 
 gdb_branding() {