diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2020-12-14 14:47:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 14:47:21 +0100 |
| commit | 3346deb478823faf709d8de39bc7e6508436ca0a (patch) | |
| tree | bf025a9da02fcb389fa1844f867e6c0457d2ccf1 | |
| parent | 805b48a4712ef4d6c85cf6acce292391a5022de7 (diff) | |
| parent | cb3ca15862585cc04c76fb4597eaea80619569f1 (diff) | |
Merge pull request #15804 from vespa-engine/toregge/use-llvm-10-on-centos-8
Use llvm 10 on CentOS 8.
| -rw-r--r-- | default_build_settings.cmake | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 11a2c50aac1..d8bbf21605a 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -31,7 +31,7 @@ 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 "9" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "10" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_darwin) diff --git a/dist/vespa.spec b/dist/vespa.spec index 6f4c8c65091..b4bbb13e7d6 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -64,7 +64,11 @@ BuildRequires: vespa-libzstd-devel >= 1.4.5-2 %endif %if 0%{?el8} BuildRequires: cmake >= 3.11.4-3 +%if 0%{?centos} +BuildRequires: llvm-devel >= 10.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 @@ -173,8 +177,13 @@ Requires: vespa-zstd >= 1.4.5-2 %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 >= 10.0.1 +%define _vespa_llvm_version 10 +%else Requires: llvm-libs >= 9.0.1 %define _vespa_llvm_version 9 +%endif Requires: openssl-libs Requires: vespa-lz4 >= 1.9.2-2 Requires: vespa-onnxruntime = 1.4.0 |