diff options
| author | Tor Egge <Tor.Egge@online.no> | 2022-01-10 10:42:53 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2022-01-10 11:12:10 +0100 |
| commit | 9e070022f4417686e5c2bd358110b691cd46cf10 (patch) | |
| tree | 56f183f93b1d268e0a7705ece60a3c8aa32a837f /dist | |
| parent | 75852e3ce2a075c73c0845a8000df4db4c1f7260 (diff) | |
Switch to gcc-toolset-11 and devtoolset-11.
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/vespa.spec | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 31eafe51ae2..6c3f68f6f74 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -50,11 +50,11 @@ BuildRequires: maven %define _java_home /usr/lib/jvm/java-11-amazon-corretto.%{?_arch} BuildRequires: python3-pytest %else -BuildRequires: devtoolset-10-gcc-c++ -BuildRequires: devtoolset-10-libatomic-devel -BuildRequires: devtoolset-10-binutils +BuildRequires: devtoolset-11-gcc-c++ +BuildRequires: devtoolset-11-libatomic-devel +BuildRequires: devtoolset-11-binutils BuildRequires: rh-maven35 -%define _devtoolset_enable /opt/rh/devtoolset-10/enable +%define _devtoolset_enable /opt/rh/devtoolset-11/enable %define _rhmaven35_enable /opt/rh/rh-maven35/enable BuildRequires: python36-pytest %endif @@ -69,10 +69,10 @@ BuildRequires: gcc-toolset-11-binutils BuildRequires: gcc-toolset-11-libatomic-devel %define _devtoolset_enable /opt/rh/gcc-toolset-11/enable %else -BuildRequires: gcc-toolset-10-gcc-c++ -BuildRequires: gcc-toolset-10-binutils -BuildRequires: gcc-toolset-10-libatomic-devel -%define _devtoolset_enable /opt/rh/gcc-toolset-10/enable +BuildRequires: gcc-toolset-11-gcc-c++ +BuildRequires: gcc-toolset-11-binutils +BuildRequires: gcc-toolset-11-libatomic-devel +%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable %endif BuildRequires: maven BuildRequires: pybind11-devel |