diff options
| author | Tor Egge <Tor.Egge@online.no> | 2021-08-23 10:12:20 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2021-08-23 10:13:39 +0200 |
| commit | d0655a2fa91feb2a45872778956b732d0a5f6042 (patch) | |
| tree | e03f9e961a050a1da84b88264e22a16c6d26749e | |
| parent | 387bbb293e60d6eb6054e17c5db937e00da80144 (diff) | |
Fedora 35 has been branched from rawhide.
| -rw-r--r-- | default_build_settings.cmake | 8 | ||||
| -rw-r--r-- | dist/vespa.spec | 13 |
2 files changed, 21 insertions, 0 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 152a0d3eef3..041ce562f44 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -91,6 +91,12 @@ function(setup_vespa_default_build_settings_fedora_35) set(DEFAULT_VESPA_LLVM_VERSION "12" PARENT_SCOPE) endfunction() +function(setup_vespa_default_build_settings_fedora_36) + message("-- Setting up default build settings for fedora 36") + set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "13" PARENT_SCOPE) +endfunction() + function(setup_vespa_default_build_settings_amzn_2) message("-- Setting up default build settings for amzn 2") set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib64" "/usr/lib64/llvm7.0/lib" PARENT_SCOPE) @@ -209,6 +215,8 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_fedora_34() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 35") setup_vespa_default_build_settings_fedora_35() + elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 36") + setup_vespa_default_build_settings_fedora_36() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "amzn 2") setup_vespa_default_build_settings_amzn_2() elseif(VESPA_OS_DISTRO STREQUAL "ubuntu") diff --git a/dist/vespa.spec b/dist/vespa.spec index 5c626d58e6a..f09ec8e365b 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -146,6 +146,13 @@ BuildRequires: boost-devel >= 1.75 BuildRequires: gtest-devel BuildRequires: gmock-devel %endif +%if 0%{?fc36} +BuildRequires: protobuf-devel +BuildRequires: llvm-devel >= 13.0.0 +BuildRequires: boost-devel >= 1.76 +BuildRequires: gtest-devel +BuildRequires: gmock-devel +%endif %endif %if 0%{?el7} && 0%{?amzn2} BuildRequires: vespa-xxhash-devel = 0.8.0 @@ -248,6 +255,9 @@ Requires: vespa-valgrind >= 3.17.0-1 %if 0%{?fc35} %define _vespa_llvm_version 12 %endif +%if 0%{?fc36} +%define _vespa_llvm_version 13 +%endif %define _extra_link_directory %{_vespa_deps_prefix}/lib64 %define _extra_include_directory %{_vespa_deps_prefix}/include;/usr/include/openblas %endif @@ -376,6 +386,9 @@ Requires: llvm-libs >= 12.0.0 %if 0%{?fc35} Requires: llvm-libs >= 12.0.0 %endif +%if 0%{?fc36} +Requires: llvm-libs >= 13.0.0 +%endif %endif Requires: vespa-onnxruntime = 1.7.1 |