summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne H Juul <arnej27959@users.noreply.github.com>2023-09-11 10:57:34 +0200
committerGitHub <noreply@github.com>2023-09-11 10:57:34 +0200
commit6d9d3fb1265a3bf61fdb2582ceb2f148ef9680c1 (patch)
treedcc4c2dd7f13b4648bf3078e580845041c380a0b
parent65cc5be1350861b9772e46d64c694be76d0f1124 (diff)
parent595402b21000c13329297983c4777c76bfbbcd73 (diff)
Merge pull request #28459 from vespa-engine/arnej/use-toolset-12-meta
use vespa-toolset-12-meta (now includes patches)
-rw-r--r--dist/vespa.spec2
1 files changed, 2 insertions, 0 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 7351ed3a74b..094c55d00da 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -47,6 +47,7 @@ BuildRequires: epel-release
%endif
%if 0%{?el8}
%global _centos_stream %(grep -qs '^NAME="CentOS Stream"' /etc/os-release && echo 1 || echo 0)
+BuildRequires: vespa-toolset-12-meta >= 12.0.1
BuildRequires: gcc-toolset-12-gcc-c++
BuildRequires: gcc-toolset-12-binutils
BuildRequires: gcc-toolset-12-libatomic-devel
@@ -60,6 +61,7 @@ BuildRequires: glibc-langpack-en
%endif
%if 0%{?el9}
%global _centos_stream %(grep -qs '^NAME="CentOS Stream"' /etc/os-release && echo 1 || echo 0)
+BuildRequires: vespa-toolset-12-meta >= 12.0.1
BuildRequires: gcc-toolset-12-gcc-c++
BuildRequires: gcc-toolset-12-binutils
BuildRequires: gcc-toolset-12-libatomic-devel