diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-12-08 05:06:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-08 05:06:26 +0100 |
| commit | 6a0387f07f25688b32d40a25661fd5c6e9fe170d (patch) | |
| tree | 44a66bae1e27babed1e684dabeadb8059b15db71 | |
| parent | 551f42c6a5e9eaf1450875e633eeb67624e43345 (diff) | |
| parent | 102b6351fc1d884ec128b50ae1a225d6dcc8607b (diff) | |
Merge pull request #20406 from vespa-engine/toregge/use-llvm-13-on-centos-8-stream
Use gcc-toolset-11 and llvm 13 on CentOS Stream 8
| -rw-r--r-- | default_build_settings.cmake | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 7413e41d00f..599aca098ec 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -32,7 +32,7 @@ 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" PARENT_SCOPE) if (VESPA_OS_DISTRO_NAME STREQUAL "CentOS Stream") - set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "13" PARENT_SCOPE) else() set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) endif() diff --git a/dist/vespa.spec b/dist/vespa.spec index 3c96c6b0ce1..f18c802d5fc 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -62,10 +62,18 @@ BuildRequires: vespa-pybind11-devel BuildRequires: python3-devel %endif %if 0%{?el8} +%global _centos_stream %(grep -qs '^NAME="CentOS Stream"' /etc/os-release && echo 1 || echo 0) +%if 0%{?_centos_stream} +BuildRequires: gcc-toolset-11-gcc-c++ +BuildRequires: gcc-toolset-11-binutils +BuildRequires: gcc-toolset-11-libatomic-devel +%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable +%else BuildRequires: gcc-toolset-10-gcc-c++ BuildRequires: gcc-toolset-10-binutils BuildRequires: gcc-toolset-10-libatomic-devel %define _devtoolset_enable /opt/rh/gcc-toolset-10/enable +%endif BuildRequires: maven BuildRequires: pybind11-devel BuildRequires: python3-pytest @@ -102,9 +110,8 @@ 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) +BuildRequires: (llvm-devel >= 13.0.0 and llvm-devel < 14) %else BuildRequires: (llvm-devel >= 12.0.0 and llvm-devel < 13) %endif @@ -255,7 +262,7 @@ Requires: vespa-gtest = 1.11.0 %if 0%{?el8} %if 0%{?centos} || 0%{?rocky} %if 0%{?_centos_stream} -%define _vespa_llvm_version 12 +%define _vespa_llvm_version 13 %else %define _vespa_llvm_version 12 %endif @@ -379,7 +386,7 @@ Requires: openssl-libs %if 0%{?el8} %if 0%{?centos} || 0%{?rocky} %if 0%{?_centos_stream} -Requires: (llvm-libs >= 12.0.0 and llvm-libs < 13) +Requires: (llvm-libs >= 13.0.0 and llvm-libs < 14) %else Requires: (llvm-libs >= 12.0.0 and llvm-libs < 13) %endif |