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 e3015bdaa8..606e48ef82 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
@@ -79,7 +79,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} )
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 e3015bdaa8..8012d10407 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
@@ -269,7 +269,8 @@ src_configure() {
 	# ensure proper compiler is detected for Clang builds: bug #831202
 	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
 
-	econf "${myconf[@]}"
+	# XXX: bash for https://inbox.sourceware.org/gdb-patches/87ecw08tfk.fsf@gentoo.org/
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
 }
 
 src_test() {