diff options
author | Tor Egge <Tor.Egge@online.no> | 2022-08-19 13:12:37 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2022-08-19 13:12:37 +0200 |
commit | 2b226504520ceabab7f52f37a509edd4aed26514 (patch) | |
tree | c348d6e325356e1c41db5ad8335e980098d1910f | |
parent | cc96b081aa8ba8cd83f23042d58eb8e693b77b82 (diff) |
Fedora 37 has been branched from Fedora rawhide.
-rw-r--r-- | default_build_settings.cmake | 8 | ||||
-rw-r--r-- | dist/vespa.spec | 19 |
2 files changed, 24 insertions, 3 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 979b71f96b3..aa92cae9b4e 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -98,6 +98,12 @@ function(setup_vespa_default_build_settings_fedora_37) set(DEFAULT_VESPA_LLVM_VERSION "14" PARENT_SCOPE) endfunction() +function(setup_vespa_default_build_settings_fedora_38) + message("-- Setting up default build settings for fedora 38") + set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "14" 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) @@ -244,6 +250,8 @@ function(vespa_use_default_build_settings) 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 "fedora 38") + setup_vespa_default_build_settings_fedora_38() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "amzn 2") setup_vespa_default_build_settings_amzn_2() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "amzn 2022") diff --git a/dist/vespa.spec b/dist/vespa.spec index b05a8853da1..813db642424 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -198,8 +198,15 @@ BuildRequires: gmock-devel %endif %if 0%{?fc37} BuildRequires: protobuf-devel -BuildRequires: llvm-devel >= 14.0.0 -BuildRequires: boost-devel >= 1.76 +BuildRequires: llvm-devel >= 14.0.5 +BuildRequires: boost-devel >= 1.78 +BuildRequires: gtest-devel +BuildRequires: gmock-devel +%endif +%if 0%{?fc38} +BuildRequires: protobuf-devel +BuildRequires: llvm-devel >= 14.0.5 +BuildRequires: boost-devel >= 1.78 BuildRequires: gtest-devel BuildRequires: gmock-devel %endif @@ -344,6 +351,9 @@ Requires: gtest %if 0%{?fc37} %define _vespa_llvm_version 14 %endif +%if 0%{?fc38} +%define _vespa_llvm_version 14 +%endif %define _extra_link_directory %{_vespa_deps_prefix}/lib64 %define _extra_include_directory %{_vespa_deps_prefix}/include;/usr/include/openblas %endif @@ -473,7 +483,10 @@ Requires: llvm-libs >= 13.0.0 Requires: llvm-libs >= 14.0.0 %endif %if 0%{?fc37} -Requires: llvm-libs >= 14.0.0 +Requires: llvm-libs >= 14.0.5 +%endif +%if 0%{?fc38} +Requires: llvm-libs >= 14.0.5 %endif %endif Requires: vespa-onnxruntime = 1.12.1 |