From 99ca7ce0568dae3b602572bf27f67e16bd381974 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Tue, 2 Jun 2020 15:51:47 +0200 Subject: RHEL 8.2 uses llvm 9. --- dist/vespa.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'dist') diff --git a/dist/vespa.spec b/dist/vespa.spec index a887fd0645b..690d4123de4 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -62,7 +62,11 @@ BuildRequires: vespa-icu-devel >= 65.1.0-1 %endif %if 0%{?el8} BuildRequires: cmake >= 3.11.4-3 +%if 0%{?centos} BuildRequires: llvm-devel >= 8.0.1 +%else +BuildRequires: llvm-devel >= 9.0.1 +%endif BuildRequires: boost-devel >= 1.66 BuildRequires: openssl-devel BuildRequires: vespa-gtest >= 1.8.1-1 @@ -162,10 +166,15 @@ Requires: vespa-telegraf >= 1.1.1-1 %define _extra_include_directory /usr/include/llvm7.0;%{_vespa_deps_prefix}/include;/usr/include/openblas %endif %if 0%{?el8} +%if 0%{?centos} Requires: llvm-libs >= 8.0.1 +%define _vespa_llvm_version 8 +%else +Requires: llvm-libs >= 9.0.1 +%define _vespa_llvm_version 9 +%endif Requires: vespa-protobuf >= 3.7.0-4 Requires: openssl-libs -%define _vespa_llvm_version 8 %define _extra_link_directory %{_vespa_deps_prefix}/lib64 %define _extra_include_directory %{_vespa_deps_prefix}/include;/usr/include/openblas %endif -- cgit v1.2.3