From f1137fbe4038e854cdc98294f581f80fca6b6693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= <mprchlik@redhat.com>
Date: Tue, 9 Apr 2024 08:44:53 +0200
Subject: [PATCH] Add support for Fedora 40

---
 tests/main.fmf           | 16 ++++++++++++++++
 tests/testsuite/main.fmf | 10 ++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/tests/main.fmf b/tests/main.fmf
index ed55d84..5787ea5 100644
--- a/tests/main.fmf
+++ b/tests/main.fmf
@@ -419,6 +419,22 @@ adjust+:
       BINUTILS_PACKAGE: binutils
       GCC_PACKAGE: gcc
 
+  # Fedora-40 / no collection
+  - when: distro == fedora-40 and collection is not defined
+    require+:
+      - binutils
+      - binutils-devel
+      - binutils-gold
+      - binutils-gprofng
+      - gcc
+      - gcc-c++
+      - annobin-plugin-gcc
+    environment+:
+      PACKAGES: binutils
+      _REQUIRES: gcc gcc-c++ glibc annobin-plugin-gcc
+      BINUTILS_PACKAGE: binutils
+      GCC_PACKAGE: gcc
+
   # Fedora-39 / no collection
   - when: distro == fedora-39 and collection is not defined
     require+:
diff --git a/tests/testsuite/main.fmf b/tests/testsuite/main.fmf
index 330d252..82ac30f 100644
--- a/tests/testsuite/main.fmf
+++ b/tests/testsuite/main.fmf
@@ -74,14 +74,8 @@ adjust+:
     environment+:
         MAY_BUILD_OTHER_ARCHES: "no"
 
-  - because: "On Fedora 39 and newer, system binutils build extra binaries for cross compilation"
-    when: distro == fedora-39
-    test: "$WITH_SCL ./test-with-cross.sh"
-    environment+:
-        MAY_BUILD_OTHER_ARCHES: "no"
-
-  - because: "On Fedora 38 and newer, system binutils build extra binaries for cross compilation"
-    when: distro == fedora-38
+  - because: "On Fedora 40 and newer, system binutils build extra binaries for cross compilation"
+    when: distro >= fedora-38
     test: "$WITH_SCL ./test-with-cross.sh"
     environment+:
         MAY_BUILD_OTHER_ARCHES: "no"