diff options
| -rw-r--r-- | default_build_settings.cmake | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 64c918370aa..cc51bbde852 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -18,7 +18,7 @@ endfunction() function(setup_vespa_default_build_settings_rhel_8) message("-- Setting up default build settings for rhel 8") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "8" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "9" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_centos_7) 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 |