From dc1fb56a31d0528a95ef11af678bed960a693f48 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Oct 2021 09:26:00 +0200 Subject: switch back to GCC 10 --- el7x81.cfg | 6 +++--- el7xscl81.cfg | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/el7x81.cfg b/el7x81.cfg index b3675c5..d4dca12 100644 --- a/el7x81.cfg +++ b/el7x81.cfg @@ -1,8 +1,8 @@ include('el7x.tpl') -config_opts['macros']['%dtsversion']="8" -config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-8/enable" -config_opts['macros']['%dtsprefix']="devtoolset-8-" +config_opts['macros']['%dtsversion']="10" +config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-10/enable" +config_opts['macros']['%dtsprefix']="devtoolset-10-" config_opts['yum.conf'] = """ [main] diff --git a/el7xscl81.cfg b/el7xscl81.cfg index ed75a13..11027c3 100644 --- a/el7xscl81.cfg +++ b/el7xscl81.cfg @@ -1,15 +1,15 @@ include('el7x.tpl') config_opts['root'] = 'scl81el7x' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build devtoolset-8-toolchain ccache php81-build php81-php-devel php81-php-pear' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build devtoolset-10-toolchain ccache php81-build php81-php-devel php81-php-pear' config_opts['resultdir'] = "/var/lib/mock/scl81el7x" config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" -config_opts['macros']['%dtsversion']="8" -config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-8/enable" -config_opts['macros']['%dtsprefix']="devtoolset-8-" +config_opts['macros']['%dtsversion']="10" +config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-10/enable" +config_opts['macros']['%dtsprefix']="devtoolset-10-" config_opts['yum.conf'] = """ [main] -- cgit