diff options
| -rw-r--r-- | default_build_settings.cmake | 6 | ||||
| -rw-r--r-- | dist/vespa.spec | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index f034c9260e4..152a0d3eef3 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -31,7 +31,11 @@ endfunction() function(setup_vespa_default_build_settings_centos_8) message("-- Setting up default build settings for centos 8") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "11" PARENT_SCOPE) + if (VESPA_OS_DISTRO_NAME STREQUAL "CentOS Stream") + set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) + else() + set(DEFAULT_VESPA_LLVM_VERSION "11" PARENT_SCOPE) + endif() endfunction() function(setup_vespa_default_build_settings_rocky_8_4) diff --git a/dist/vespa.spec b/dist/vespa.spec index 7bee7e2a8d0..c92a4e9859b 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -102,7 +102,12 @@ BuildRequires: cmake >= 3.11.4-3 BuildRequires: libarchive %endif %define _command_cmake cmake +%global _centos_stream %(grep -qs '^NAME="CentOS Stream"' /etc/os-release && echo 1 || echo 0) +%if 0%{?_centos_stream} +BuildRequires: (llvm-devel >= 12.0.0 and llvm-devel < 13) +%else BuildRequires: (llvm-devel >= 11.0.0 and llvm-devel < 12) +%endif %else BuildRequires: (llvm-devel >= 10.0.1 and llvm-devel < 11) %endif @@ -226,7 +231,11 @@ Requires: vespa-valgrind >= 3.17.0-1 %endif %if 0%{?el8} %if 0%{?centos} || 0%{?rocky} +%if 0%{?_centos_stream} +%define _vespa_llvm_version 12 +%else %define _vespa_llvm_version 11 +%endif %else %define _vespa_llvm_version 10 %endif @@ -358,7 +367,11 @@ Requires: openssl-libs %endif %if 0%{?el8} %if 0%{?centos} || 0%{?rocky} +%if 0%{?_centos_stream} +Requires: (llvm-libs >= 12.0.0 and llvm-libs < 13) +%else Requires: (llvm-libs >= 11.0.0 and llvm-libs < 12) +%endif %else Requires: (llvm-libs >= 10.0.1 and llvm-libs < 11) %endif |