diff options
| author | Tor Egge <Tor.Egge@online.no> | 2022-03-08 14:46:51 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2022-03-08 14:46:51 +0100 |
| commit | 78b878d775d5d4560b743e7d293a4b2d21a77c45 (patch) | |
| tree | 749457e405814fcacbd19a6c9d3469a769286e1c | |
| parent | b1015bd850fb94157d8c21077578e45628384e02 (diff) | |
Fedora 36 has been branched from rawhide.
| -rw-r--r-- | default_build_settings.cmake | 8 | ||||
| -rw-r--r-- | dist/vespa.spec | 17 |
2 files changed, 23 insertions, 2 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 1432ea7164c..1925e5f42b6 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -86,6 +86,12 @@ function(setup_vespa_default_build_settings_fedora_36) set(DEFAULT_VESPA_LLVM_VERSION "13" PARENT_SCOPE) endfunction() +function(setup_vespa_default_build_settings_fedora_37) + message("-- Setting up default build settings for fedora 37") + 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) @@ -206,6 +212,8 @@ function(vespa_use_default_build_settings) 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 "fedora 37") + setup_vespa_default_build_settings_fedora_37() 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 74ef6a6f8fc..e6ef819b458 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -177,7 +177,14 @@ BuildRequires: gmock-devel %endif %if 0%{?fc36} BuildRequires: protobuf-devel -BuildRequires: llvm-devel >= 13.0.0 +BuildRequires: llvm-devel >= 13.0.1 +BuildRequires: boost-devel >= 1.76 +BuildRequires: gtest-devel +BuildRequires: gmock-devel +%endif +%if 0%{?fc37} +BuildRequires: protobuf-devel +BuildRequires: llvm-devel >= 13.0.1 BuildRequires: boost-devel >= 1.76 BuildRequires: gtest-devel BuildRequires: gmock-devel @@ -316,6 +323,9 @@ Requires: gtest %if 0%{?fc36} %define _vespa_llvm_version 13 %endif +%if 0%{?fc37} +%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 @@ -434,7 +444,10 @@ Requires: llvm-libs >= 12.0.0 Requires: llvm-libs >= 13.0.0 %endif %if 0%{?fc36} -Requires: llvm-libs >= 13.0.0 +Requires: llvm-libs >= 13.0.1 +%endif +%if 0%{?fc37} +Requires: llvm-libs >= 13.0.1 %endif %endif Requires: vespa-onnxruntime = 1.7.1 |