diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2021-02-20 20:11:52 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2021-02-20 22:30:26 +0100 |
| commit | d1d509d6fe7ac97c9b395d5ada58ffa82aee4f23 (patch) | |
| tree | 48a31bc1a4da0b67ac7359257435db01cba8b8b6 | |
| parent | 90ac17a86fbdc132a1db7ff32204a66666e1f98e (diff) | |
Fedora 34 has been branched from rawhide.
| -rw-r--r-- | default_build_settings.cmake | 8 | ||||
| -rw-r--r-- | dist/vespa.spec | 18 |
2 files changed, 23 insertions, 3 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 07191d6781e..c88d82db59a 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -75,6 +75,12 @@ function(setup_vespa_default_build_settings_fedora_34) set(DEFAULT_VESPA_LLVM_VERSION "11" PARENT_SCOPE) endfunction() +function(setup_vespa_default_build_settings_fedora_35) + message("-- Setting up default build settings for fedora 35") + set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "11" PARENT_SCOPE) +endfunction() + function(setup_vespa_default_build_settings_ubuntu) message("-- Setting up default build settings for ubuntu") SET(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL) @@ -182,6 +188,8 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_fedora_33() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 34") 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 STREQUAL "ubuntu") setup_vespa_default_build_settings_ubuntu() elseif(VESPA_OS_DISTRO STREQUAL "debian") diff --git a/dist/vespa.spec b/dist/vespa.spec index e2fffa702b7..193723a0d0f 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -96,8 +96,15 @@ BuildRequires: gmock-devel %endif %if 0%{?fc34} BuildRequires: protobuf-devel -BuildRequires: llvm-devel >= 11.0.0 -BuildRequires: boost-devel >= 1.73 +BuildRequires: llvm-devel >= 11.1.0 +BuildRequires: boost-devel >= 1.75 +BuildRequires: gtest-devel +BuildRequires: gmock-devel +%endif +%if 0%{?fc35} +BuildRequires: protobuf-devel +BuildRequires: llvm-devel >= 11.1.0 +BuildRequires: boost-devel >= 1.75 BuildRequires: gtest-devel BuildRequires: gmock-devel %endif @@ -201,7 +208,12 @@ Requires: llvm-libs >= 11.0.0 %endif %if 0%{?fc34} Requires: protobuf -Requires: llvm-libs >= 11.0.0 +Requires: llvm-libs >= 11.1.0 +%define _vespa_llvm_version 11 +%endif +%if 0%{?fc35} +Requires: protobuf +Requires: llvm-libs >= 11.1.0 %define _vespa_llvm_version 11 %endif %define _extra_link_directory %{_vespa_deps_prefix}/lib64 |