From 7cdb0f85c15ddea04e266d4da588a67a06e69c8a Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Oct 20 2022 15:07:38 +0000
Subject: upgrade all llvm-toolset-14.0 to use both devtoolset-12 and devtoolset-10 along with devtoolset-9


---

diff --git a/mock/c7-llvm-toolset-14.0.aarch64.cfg b/mock/c7-llvm-toolset-14.0.aarch64.cfg
index a41909d..8f8082a 100644
--- a/mock/c7-llvm-toolset-14.0.aarch64.cfg
+++ b/mock/c7-llvm-toolset-14.0.aarch64.cfg
@@ -60,6 +60,16 @@ name=c7-devtoolset-9
 baseurl=http://repohost/repo/c7-devtoolset-9.aarch64/
 gpgcheck=0
 
+[c7-devtoolset-10.aarch64]
+name=c7-devtoolset-10
+baseurl=http://repohost/repo/c7-devtoolset-10.aarch64/
+gpgcheck=0
+
+[c7-devtoolset-12.aarch64]
+name=c7-devtoolset-12
+baseurl=http://repohost/repo/c7-devtoolset-12.aarch64/
+gpgcheck=0
+
 [c7.1810.u.aarch64]
 name=c7.1810.u.aarch64
 baseurl=http://repohost/repo/c7.1810.u.aarch64/
diff --git a/mock/c7-llvm-toolset-14.0.armhfp.cfg b/mock/c7-llvm-toolset-14.0.armhfp.cfg
index 078fea9..9d436ed 100644
--- a/mock/c7-llvm-toolset-14.0.armhfp.cfg
+++ b/mock/c7-llvm-toolset-14.0.armhfp.cfg
@@ -17,9 +17,6 @@ config_opts['macros']['%_vendor_host'] = "redhat"
 config_opts['macros']['%_host'] = "armv7hl-redhat-linux-gnu"
 #config_opts['macros']['%global _binaries_in_noarch_packages_terminate_build'] = "0"
 
-# Added for devtoolset-6
-config_opts['scl'] = "devtoolset-9"
-
 
 # no ccache in base repo
 config_opts['plugin_conf']['ccache_enable'] = False
@@ -95,6 +92,18 @@ baseurl=http://repohost/repo/c7-devtoolset-9.armhfp/
 enabled=1
 gpgcheck=0
 
+[c7-devtoolset-10.armhfp]
+name=c7-devtoolset-10.armhfp
+baseurl=http://repohost/repo/c7-devtoolset-10.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7-devtoolset-12.armhfp]
+name=c7-devtoolset-12.armhfp
+baseurl=http://repohost/repo/c7-devtoolset-12.armhfp/
+enabled=1
+gpgcheck=0
+
 [c7.1810.00.armhfp]
 name=c7.1810.00.armhfp
 baseurl=http://repohost/repo/c7.1810.00.armhfp/
diff --git a/mock/c7-llvm-toolset-14.0.i386.cfg b/mock/c7-llvm-toolset-14.0.i386.cfg
index 08c53a0..775fa69 100644
--- a/mock/c7-llvm-toolset-14.0.i386.cfg
+++ b/mock/c7-llvm-toolset-14.0.i386.cfg
@@ -122,6 +122,11 @@ name=c7-devtoolset-9
 enabled=1
 baseurl=http://repohost/repo/c7-devtoolset-9.i386/
 
+[c7-devtoolset-10.i386]
+name=c7-devtoolset-10
+enabled=1
+baseurl=http://repohost/repo/c7-devtoolset-10.i386/
+
 [c7-devtoolset-12.i386]
 name=c7-devtoolset-12
 enabled=1
diff --git a/mock/c7-llvm-toolset-14.0.ppc.cfg b/mock/c7-llvm-toolset-14.0.ppc.cfg
index 6ae2858..8d3dc3d 100644
--- a/mock/c7-llvm-toolset-14.0.ppc.cfg
+++ b/mock/c7-llvm-toolset-14.0.ppc.cfg
@@ -61,6 +61,16 @@ name=c7-devtoolset-9
 baseurl=http://repohost/repo/c7-devtoolset-9.ppc/
 gpgcheck=0
 
+[c7-devtoolset-10.ppc]
+name=c7-devtoolset-10
+baseurl=http://repohost/repo/c7-devtoolset-10.ppc/
+gpgcheck=0
+
+[c7-devtoolset-12.ppc]
+name=c7-devtoolset-12
+baseurl=http://repohost/repo/c7-devtoolset-12.ppc/
+gpgcheck=0
+
 [c7.1810.u.ppc]
 name=c7.1810.u.ppc
 baseurl=http://repohost/repo/c7.1810.u.ppc/
diff --git a/mock/c7-llvm-toolset-14.0.ppc64.cfg b/mock/c7-llvm-toolset-14.0.ppc64.cfg
index 9ef472b..094df9c 100644
--- a/mock/c7-llvm-toolset-14.0.ppc64.cfg
+++ b/mock/c7-llvm-toolset-14.0.ppc64.cfg
@@ -66,6 +66,18 @@ baseurl=http://repohost/repo/c7-devtoolset-9.ppc64/
 gpgcheck=0
 includepkgs=*.ppc64 *.noarch glibc.ppc glibc-devel.ppc nss-softokn-freebl*.ppc
 
+[c7-devtoolset-10.ppc64]
+name=c7-devtoolset-10
+baseurl=http://repohost/repo/c7-devtoolset-10.ppc64/
+gpgcheck=0
+includepkgs=*.ppc64 *.noarch glibc.ppc glibc-devel.ppc nss-softokn-freebl*.ppc
+
+[c7-devtoolset-12.ppc64]
+name=c7-devtoolset-12
+baseurl=http://repohost/repo/c7-devtoolset-12.ppc64/
+gpgcheck=0
+includepkgs=*.ppc64 *.noarch glibc.ppc glibc-devel.ppc nss-softokn-freebl*.ppc
+
 [c7.1810.u.ppc64]
 name=c7.1810.u.ppc64
 baseurl=http://repohost/repo/c7.1810.u.ppc64/
diff --git a/mock/c7-llvm-toolset-14.0.ppc64le.cfg b/mock/c7-llvm-toolset-14.0.ppc64le.cfg
index ab16a2e..158697b 100644
--- a/mock/c7-llvm-toolset-14.0.ppc64le.cfg
+++ b/mock/c7-llvm-toolset-14.0.ppc64le.cfg
@@ -60,6 +60,16 @@ name=c7-devtoolset-9
 baseurl=http://repohost/repo/c7-devtoolset-9.ppc64le/
 gpgcheck=0
 
+[c7-devtoolset-10.ppc64le]
+name=c7-devtoolset-10
+baseurl=http://repohost/repo/c7-devtoolset-10.ppc64le/
+gpgcheck=0
+
+[c7-devtoolset-12.ppc64le]
+name=c7-devtoolset-12
+baseurl=http://repohost/repo/c7-devtoolset-12.ppc64le/
+gpgcheck=0
+
 [c7.1810.u.ppc64le]
 name=c7.1810.u.ppc64le
 baseurl=http://repohost/repo/c7.1810.u.ppc64le/
diff --git a/mock/c7-llvm-toolset-14.0.x86_64.cfg b/mock/c7-llvm-toolset-14.0.x86_64.cfg
index 520dca9..8ba62e2 100644
--- a/mock/c7-llvm-toolset-14.0.x86_64.cfg
+++ b/mock/c7-llvm-toolset-14.0.x86_64.cfg
@@ -142,6 +142,12 @@ enabled=1
 baseurl=http://repohost/repo/c7-devtoolset-12.x86_64/
 includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
 
+[c7-devtoolset-10]
+name=c7-devtoolset-10
+enabled=1
+baseurl=http://repohost/repo/c7-devtoolset-10.x86_64/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
 [c7.1810.u.x86_64]
 name=c7.1810.u.x86_64
 enabled=1