diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2020-11-30 12:37:02 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-11-30 12:37:02 +0100 |
| commit | ee37b28772985c4c151d8a7fc35956ba0556a5a3 (patch) | |
| tree | 2e2aaed2368355778c3a301de41236e033ab3f4f | |
| parent | 92cf9ac73d287adaa9d7dec713635f5714d7575a (diff) | |
Fedora 31 is EOL.
| -rw-r--r-- | default_build_settings.cmake | 17 | ||||
| -rw-r--r-- | dist/vespa.spec | 12 |
2 files changed, 0 insertions, 29 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 23c78861fc7..11a2c50aac1 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -57,19 +57,6 @@ function(setup_vespa_default_build_settings_darwin) list(APPEND DEFAULT_EXTRA_INCLUDE_DIRECTORY "/usr/local/include") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${DEFAULT_EXTRA_INCLUDE_DIRECTORY}" PARENT_SCOPE) endfunction() - -function(setup_vespa_default_build_settings_fedora_30) - message("-- Setting up default build settings for fedora 30") - set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "8" PARENT_SCOPE) -endfunction() - -function(setup_vespa_default_build_settings_fedora_31) - message("-- Setting up default build settings for fedora 31") - set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "9" 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) @@ -186,10 +173,6 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_centos_8() elseif(VESPA_OS_DISTRO STREQUAL "darwin") setup_vespa_default_build_settings_darwin() - elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 30") - setup_vespa_default_build_settings_fedora_30() - elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 31") - setup_vespa_default_build_settings_fedora_31() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 32") setup_vespa_default_build_settings_fedora_32() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 33") diff --git a/dist/vespa.spec b/dist/vespa.spec index 93f8842acec..0d26258dc5a 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -80,13 +80,6 @@ BuildRequires: openssl-devel BuildRequires: vespa-lz4-devel >= 1.9.2-2 BuildRequires: vespa-onnxruntime-devel = 1.4.0 BuildRequires: vespa-libzstd-devel >= 1.4.5-2 -%if 0%{?fc31} -BuildRequires: vespa-protobuf-devel >= 3.7.0-4 -BuildRequires: llvm-devel >= 9.0.0 -BuildRequires: boost-devel >= 1.69 -BuildRequires: gtest-devel -BuildRequires: gmock-devel -%endif %if 0%{?fc32} BuildRequires: protobuf-devel BuildRequires: llvm-devel >= 10.0.0 @@ -195,11 +188,6 @@ Requires: openssl-libs Requires: vespa-lz4 >= 1.9.2-2 Requires: vespa-onnxruntime = 1.4.0 Requires: vespa-zstd >= 1.4.5-2 -%if 0%{?fc31} -Requires: vespa-protobuf >= 3.7.0-4 -Requires: llvm-libs >= 9.0.0 -%define _vespa_llvm_version 9 -%endif %if 0%{?fc32} Requires: protobuf Requires: llvm-libs >= 10.0.0 |