diff options
| -rw-r--r-- | default_build_settings.cmake | 10 | ||||
| -rw-r--r-- | dist/vespa.spec | 16 |
2 files changed, 19 insertions, 7 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index c9d8ddea985..daa8d4b990b 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -50,10 +50,10 @@ function(setup_vespa_default_build_settings_rocky_8_5) set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) endfunction() -function(setup_vespa_default_build_settings_almalinux_8_5) - message("-- Setting up default build settings for almalinux 8.5") +function(setup_vespa_default_build_settings_almalinux_8_6) + message("-- Setting up default build settings for almalinux 8.6") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "13" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_darwin) @@ -208,8 +208,8 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_centos_stream_9() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "rocky 8.5") setup_vespa_default_build_settings_rocky_8_5() - elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "almalinux 8.5") - setup_vespa_default_build_settings_almalinux_8_5() + elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "almalinux 8.6") + setup_vespa_default_build_settings_almalinux_8_6() elseif(VESPA_OS_DISTRO STREQUAL "darwin") setup_vespa_default_build_settings_darwin() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 34") diff --git a/dist/vespa.spec b/dist/vespa.spec index c45fb81f7a6..5a229c8fff0 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -126,7 +126,11 @@ BuildRequires: libarchive %if 0%{?_centos_stream} BuildRequires: (llvm-devel >= 13.0.0 and llvm-devel < 14) %else -BuildRequires: (llvm-devel >= 12.0.0 and llvm-devel < 13) +%if 0%{?almalinux} +BuildRequires: (llvm-devel >= 13.0.1 and llvm-devel < 14) +%else +BuildRequires: (llvm-devel >= 12.0.1 and llvm-devel < 13) +%endif %endif %else BuildRequires: (llvm-devel >= 12.0.1 and llvm-devel < 13) @@ -301,8 +305,12 @@ Requires: vespa-gtest = 1.11.0 %if 0%{?_centos_stream} %define _vespa_llvm_version 13 %else +%if 0%{?almalinux} +%define _vespa_llvm_version 13 +%else %define _vespa_llvm_version 12 %endif +%endif %else %define _vespa_llvm_version 12 %endif @@ -432,7 +440,11 @@ Requires: openssl-libs %if 0%{?_centos_stream} Requires: (llvm-libs >= 13.0.0 and llvm-libs < 14) %else -Requires: (llvm-libs >= 12.0.0 and llvm-libs < 13) +%if 0%{?almalinux} +Requires: (llvm-libs >= 13.0.1 and llvm-libs < 14) +%else +Requires: (llvm-libs >= 12.0.1 and llvm-libs < 13) +%endif %endif %else Requires: (llvm-libs >= 12.0.1 and llvm-libs < 13) |