From 4da7869567e3be601a8d2aa70b2c27cd891c3fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= <mprchlik@redhat.com>
Date: Thu, 11 Jan 2024 16:11:12 +0100
Subject: [PATCH] Enable gcc-toolset-13 binutils on CentOS Stream 9

---
 tests/main.fmf           | 16 ++++++++++++++++
 tests/testsuite/main.fmf |  6 ++++++
 2 files changed, 22 insertions(+)

diff --git a/tests/main.fmf b/tests/main.fmf
index ec37c71..5be23e8 100644
--- a/tests/main.fmf
+++ b/tests/main.fmf
@@ -237,6 +237,22 @@ adjust+:
       GCC_PACKAGE: gcc
 
   # CentOS Stream 9 / gcc-toolset-13
+  - when: distro == centos-stream-9 and collection == gcc-toolset-13
+    require+:
+      - gcc-toolset-13-binutils
+      - gcc-toolset-13-binutils-devel
+      - gcc-toolset-13-binutils-gold
+      - gcc-toolset-13-gcc
+      - gcc-toolset-13-gcc-c++
+      - gcc-toolset-13-gcc-plugin-annobin
+    environment+:
+      PACKAGES: gcc-toolset-13-binutils
+      _REQUIRES: gcc-toolset-13-gcc gcc-toolset-13-gcc-c++ gcc-toolset-13-gcc-plugin-annobin glibc
+      WITH_SCL: scl enable gcc-toolset-13
+      BINUTILS_PACKAGE: gcc-toolset-13-binutils
+      GCC_PACKAGE: gcc-toolset-13-gcc
+      COLLECTION_PACKAGES: gcc-toolset-13-binutils gcc-toolset-13-binutils-devel gcc-toolset-13-binutils-gold
+
   # CentOS Stream 9 / gcc-toolset-12
   # CentOS Stream 9 / gcc-toolset-11
 
diff --git a/tests/testsuite/main.fmf b/tests/testsuite/main.fmf
index 9545398..3868add 100644
--- a/tests/testsuite/main.fmf
+++ b/tests/testsuite/main.fmf
@@ -54,6 +54,12 @@ adjust+:
     when: distro == centos-stream-9 and collection is not defined
     test: "$WITH_SCL ./test-with-cross.sh"
 
+  - because: "On CentOS Stream 9, gcc-toolset-13 build has extra directory levels"
+    when: distro == centos-stream-9 and collection == gcc-toolset-13
+    test: "$WITH_SCL ./test-with-cross.sh"
+    environment+:
+        MAY_BUILD_OTHER_ARCHES: "no"
+
   - because: "On Fedora 39 and newer, system binutils build extra binaries for cross compilation"
     when: distro == fedora-rawhide
     test: "$WITH_SCL ./test-with-cross.sh"