diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2020-08-30 22:44:38 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-09-03 19:59:14 +0200 |
| commit | baae7608f1c7d24e4900cd8263f553534aeacf2f (patch) | |
| tree | 3f271aaf1b39658d68a4d3b4cf23f0a9eec04a10 | |
| parent | dea4b4b9ce2aaaadfdca6b8f933967f4b359da25 (diff) | |
Add settings for Fedora rawhide.
| -rw-r--r-- | default_build_settings.cmake | 8 | ||||
| -rw-r--r-- | dist/vespa.spec | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 75399069619..12201af56bb 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -82,6 +82,12 @@ function(setup_vespa_default_build_settings_fedora_33) set(DEFAULT_VESPA_LLVM_VERSION "11" PARENT_SCOPE) endfunction() +function(setup_vespa_default_build_settings_fedora_34) + message("-- Setting up default build settings for fedora 34") + 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_19_10) message("-- Setting up default build settings for ubuntu 19.10") set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib" "/usr/lib/llvm-9/lib" PARENT_SCOPE) @@ -186,6 +192,8 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_fedora_32() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 33") 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 "ubuntu 19.10") setup_vespa_default_build_settings_ubuntu_19_10() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "ubuntu 20.04") diff --git a/dist/vespa.spec b/dist/vespa.spec index 8dae9ee17bc..4165d6cc7f1 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -102,6 +102,13 @@ BuildRequires: boost-devel >= 1.73 BuildRequires: gtest-devel BuildRequires: gmock-devel %endif +%if 0%{?fc34} +BuildRequires: protobuf-devel +BuildRequires: llvm-devel >= 11.0.0 +BuildRequires: boost-devel >= 1.73 +BuildRequires: gtest-devel +BuildRequires: gmock-devel +%endif %endif BuildRequires: xxhash-devel >= 0.7.3 BuildRequires: openblas-devel @@ -203,6 +210,11 @@ Requires: protobuf Requires: llvm-libs >= 11.0.0 %define _vespa_llvm_version 11 %endif +%if 0%{?fc34} +Requires: protobuf +Requires: llvm-libs >= 11.0.0 +%define _vespa_llvm_version 11 +%endif %define _extra_link_directory %{_vespa_deps_prefix}/lib64 %define _extra_include_directory %{_vespa_deps_prefix}/include;/usr/include/openblas %endif |