From 2581ee16bdfe79b9d5bb9db7686fa562e2e3dda0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 30 Sep 2021 17:48:12 +0200 Subject: switch back to GCC 8 for PHP 8.1 on EL-7 --- el7x81.cfg | 6 +++--- el7xscl81.cfg | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/el7x81.cfg b/el7x81.cfg index d4dca12..b3675c5 100644 --- a/el7x81.cfg +++ b/el7x81.cfg @@ -1,8 +1,8 @@ include('el7x.tpl') -config_opts['macros']['%dtsversion']="10" -config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-10/enable" -config_opts['macros']['%dtsprefix']="devtoolset-10-" +config_opts['macros']['%dtsversion']="8" +config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-8/enable" +config_opts['macros']['%dtsprefix']="devtoolset-8-" config_opts['yum.conf'] = """ [main] diff --git a/el7xscl81.cfg b/el7xscl81.cfg index 11027c3..ed75a13 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-10-toolchain ccache php81-build php81-php-devel php81-php-pear' +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['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']="10" -config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-10/enable" -config_opts['macros']['%dtsprefix']="devtoolset-10-" +config_opts['macros']['%dtsversion']="8" +config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-8/enable" +config_opts['macros']['%dtsprefix']="devtoolset-8-" config_opts['yum.conf'] = """ [main] -- cgit