diff options
| -rw-r--r-- | default_build_settings.cmake | 16 | ||||
| -rw-r--r-- | dist/vespa.spec | 26 |
2 files changed, 0 insertions, 42 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 01ca3590b0f..1432ea7164c 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -68,18 +68,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_32) - message("-- Setting up default build settings for fedora 32") - set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "10" PARENT_SCOPE) -endfunction() - -function(setup_vespa_default_build_settings_fedora_33) - message("-- Setting up default build settings for fedora 33") - 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_fedora_34) message("-- Setting up default build settings for fedora 34") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) @@ -212,10 +200,6 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_almalinux_8_5() elseif(VESPA_OS_DISTRO STREQUAL "darwin") setup_vespa_default_build_settings_darwin() - elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 32") - 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 "fedora 35") diff --git a/dist/vespa.spec b/dist/vespa.spec index ab7bb6acb2d..acd9c30956e 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -156,20 +156,6 @@ BuildRequires: openssl-devel BuildRequires: vespa-lz4-devel >= 1.9.2-2 BuildRequires: vespa-onnxruntime-devel = 1.7.1 BuildRequires: vespa-libzstd-devel >= 1.4.5-2 -%if 0%{?fc32} -BuildRequires: protobuf-devel -BuildRequires: llvm-devel >= 10.0.0 -BuildRequires: boost-devel >= 1.69 -BuildRequires: gtest-devel -BuildRequires: gmock-devel -%endif -%if 0%{?fc33} -BuildRequires: protobuf-devel -BuildRequires: llvm-devel >= 11.0.0 -BuildRequires: boost-devel >= 1.73 -BuildRequires: gtest-devel -BuildRequires: gmock-devel -%endif %if 0%{?fc34} BuildRequires: protobuf-devel BuildRequires: llvm-devel >= 12.0.0 @@ -316,12 +302,6 @@ Requires: gtest %endif %if 0%{?fedora} Requires: gtest -%if 0%{?fc32} -%define _vespa_llvm_version 10 -%endif -%if 0%{?fc33} -%define _vespa_llvm_version 11 -%endif %if 0%{?fc34} %define _vespa_llvm_version 12 %endif @@ -442,12 +422,6 @@ Requires: protobuf %endif %if 0%{?fedora} Requires: protobuf -%if 0%{?fc32} -Requires: llvm-libs >= 10.0.0 -%endif -%if 0%{?fc33} -Requires: llvm-libs >= 11.0.0 -%endif %if 0%{?fc34} Requires: llvm-libs >= 12.0.0 %endif |