From 14a314a859952495db577f67a1a4dd84d987ac7c Mon Sep 17 00:00:00 2001
From: Keith Seitz <keiths@redhat.com>
Date: Tue, 10 Oct 2023 14:43:30 -0400
Subject: [PATCH] Fixup testing dependencies for GTS.

Relates: RHEL-7330
---
 gdb.spec | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/gdb.spec b/gdb.spec
index b309fff..c32c1e3 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -11,10 +11,14 @@
 # Turn off the brp-python-bytecompile automagic
 %global _python_bytecompile_extra 0
 
-# GTS magic sauce.
+# GTS magic sauce.  On GTS N (N >= 13), we always build using
+# the system compiler and elfutils.
+#
+# For testing, we use the GTS (N-1) compiler and the system valgrind/elfutils.
+
 %{?scl_package:%global scl gcc-toolset-13}
 %global scl_prefix gcc-toolset-13-
-%global scl_testing_prefix gcc-toolset-12-
+%global scl_testing_cc_prefix gcc-toolset-12-
 BuildRequires: scl-utils-build
 
 # Only build on x86 for RHEL6 SCL, defining missing parallel make macros.
@@ -318,7 +322,7 @@ BuildRequires: elfutils-debuginfod-client-devel
 %if 0%{!?el6:1} && 0%{?scl:1}
 %global have_debuginfod 1
 %global use_scl_for_debuginfod 1
-BuildRequires: %{?scl_prefix}elfutils-debuginfod-client-devel
+BuildRequires: elfutils-debuginfod-client-devel
 %endif
 %endif
 
@@ -347,14 +351,14 @@ BuildRequires: boost-devel
 BuildRequires: sharutils dejagnu
 # gcc-objc++ is not covered by the GDB testsuite.
 # Test supported SCL toolchain components.
-BuildRequires: %{?scl_testing_prefix}gcc %{?scl_testing_prefix}gcc-c++ %{?scl_testing_prefix}gcc-gfortran
+BuildRequires: %{?scl_testing_cc_prefix}gcc %{?scl_testing_cc_prefix}gcc-c++ %{?scl_testing_cc_prefix}gcc-gfortran
 
 %if 0%{!?rhel:1} || 0%{?rhel} < 8
 BuildRequires: gcc-objc
 %endif
 # We don't support gcc-gdb-plugin on RHEL anymore.
 %if 0%{!?rhel:1}
-BuildRequires: %{?scl_testing_prefix}gcc-gdb-plugin%{?_isa}
+BuildRequires: gcc-gdb-plugin%{?_isa}
 %endif
 %if 0%{?rhel:1} && 0%{?rhel} < 7
 BuildRequires: gcc-java libgcj%{bits_local} libgcj%{bits_other}
@@ -424,12 +428,12 @@ BuildRequires: libquadmath%{bits_local} libquadmath%{bits_other}
 BuildRequires: glibc-static%{bits_other}
 %endif
 %ifarch s390x
-BuildRequires: %{?scl_testing_preifx}valgrind%{bits_local}
+BuildRequires: valgrind%{bits_local}
 %if 0%{!?rhel:1} || 0%{?rhel} > 7
-BuildRequires: %{?scl_testing_prefix}valgrind%{bits_local} valgrind%{bits_other}
+BuildRequires: valgrind%{bits_local} valgrind%{bits_other}
 %endif
 %else
-BuildRequires: %{?scl_testing_prefix}valgrind%{bits_local} valgrind%{bits_other}
+BuildRequires: valgrind%{bits_local} valgrind%{bits_other}
 %endif
 %if 0%{!?rhel:1} || 0%{?rhel} > 6
 BuildRequires: xz
@@ -438,7 +442,7 @@ BuildRequires: xz
 BuildRequires: rust
 %endif
 %if 0%{!?el6:1}
-BuildRequires: %{?scl_testing_prefix}elfutils-debuginfod
+BuildRequires: elfutils-debuginfod
 %endif
 %endif # 0%{?_with_testsuite:1}
 BuildRequires: make gmp-devel