diff options
Diffstat (limited to 'dist')
-rw-r--r-- | dist/vespa.spec | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 16222ed3852..b2f3d1d5df4 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -30,11 +30,11 @@ BuildRequires: centos-release-scl %endif %endif %if 0%{?el7} -BuildRequires: devtoolset-8-gcc-c++ -BuildRequires: devtoolset-8-libatomic-devel -BuildRequires: devtoolset-8-binutils +BuildRequires: devtoolset-9-gcc-c++ +BuildRequires: devtoolset-9-libatomic-devel +BuildRequires: devtoolset-9-binutils BuildRequires: rh-maven35 -%define _devtoolset_enable /opt/rh/devtoolset-8/enable +%define _devtoolset_enable /opt/rh/devtoolset-9/enable %define _rhmaven35_enable /opt/rh/rh-maven35/enable %endif %if 0%{?el8} @@ -49,7 +49,7 @@ BuildRequires: libatomic BuildRequires: Judy-devel %if 0%{?el7} BuildRequires: cmake3 -BuildRequires: llvm5.0-devel +BuildRequires: llvm7.0-devel BuildRequires: vespa-boost-devel >= 1.59.0-6 BuildRequires: vespa-gtest >= 1.8.1-1 BuildRequires: vespa-protobuf-devel >= 3.7.0-4 @@ -154,14 +154,14 @@ Requires: perf Requires: gdb Requires: net-tools %if 0%{?el7} -Requires: llvm5.0 +Requires: llvm7.0 Requires: vespa-openssl >= 1.1.1c-1 Requires: vespa-icu >= 65.1.0-1 Requires: vespa-protobuf >= 3.7.0-4 Requires: vespa-telegraf >= 1.1.1-1 -%define _vespa_llvm_version 5.0 -%define _extra_link_directory /usr/lib64/llvm5.0/lib;%{_vespa_deps_prefix}/lib64 -%define _extra_include_directory /usr/include/llvm5.0;%{_vespa_deps_prefix}/include;/usr/include/openblas +%define _vespa_llvm_version 7 +%define _extra_link_directory /usr/lib64/llvm7.0/lib;%{_vespa_deps_prefix}/lib64 +%define _extra_include_directory /usr/include/llvm7.0;%{_vespa_deps_prefix}/include;/usr/include/openblas %endif %if 0%{?el8} Requires: llvm-libs >= 8.0.1 |