From 13264cceece3d903d00ea8a3a8db86007c3e1e84 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Sun, 25 Sep 2022 19:05:08 +0200 Subject: Remove build settings for Fedora 35. --- default_build_settings.cmake | 8 -------- dist/vespa.spec | 13 ------------- 2 files changed, 21 deletions(-) diff --git a/default_build_settings.cmake b/default_build_settings.cmake index d306e68adff..fe17192b6b8 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -50,12 +50,6 @@ function(setup_vespa_default_build_settings_darwin) set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${DEFAULT_EXTRA_INCLUDE_DIRECTORY}" 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 "13" 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) @@ -197,8 +191,6 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_almalinux_9_0() elseif(VESPA_OS_DISTRO STREQUAL "darwin") setup_vespa_default_build_settings_darwin() - 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 "fedora 37") diff --git a/dist/vespa.spec b/dist/vespa.spec index 7c13031e0b3..b3edb0b7197 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -142,13 +142,6 @@ BuildRequires: boost-devel >= 1.75 BuildRequires: gtest-devel BuildRequires: gmock-devel %endif -%if 0%{?fc35} -BuildRequires: protobuf-devel -BuildRequires: llvm-devel >= 13.0.0 -BuildRequires: boost-devel >= 1.76 -BuildRequires: gtest-devel -BuildRequires: gmock-devel -%endif %if 0%{?fc36} BuildRequires: protobuf-devel BuildRequires: llvm-devel >= 14.0.0 @@ -266,9 +259,6 @@ Requires: gtest %if 0%{?amzn2022} %define _vespa_llvm_version 14 %endif -%if 0%{?fc35} -%define _vespa_llvm_version 13 -%endif %if 0%{?fc36} %define _vespa_llvm_version 14 %endif @@ -387,9 +377,6 @@ Requires: protobuf %if 0%{?amzn2022} Requires: llvm-libs >= 14.0.5 %endif -%if 0%{?fc35} -Requires: llvm-libs >= 13.0.0 -%endif %if 0%{?fc36} Requires: llvm-libs >= 14.0.0 %endif -- cgit v1.2.3