diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-08-19 15:06:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-19 15:06:48 +0200 |
commit | f0790b529463aba73d3e37f738d96529f79172d1 (patch) | |
tree | 983df9cfe7ab4bc9a9785a5ea08df5a2a1214f57 | |
parent | af932a3d29a2917f52a4974179b1720ab71edfe8 (diff) | |
parent | 07428d2ae52012f6f11cbf38b7d0167627696ac2 (diff) |
Merge pull request #23722 from vespa-engine/toregge/fedora-34-is-eol
Fedora 34 is EOL.
-rw-r--r-- | default_build_settings.cmake | 8 | ||||
-rw-r--r-- | dist/vespa.spec | 16 |
2 files changed, 2 insertions, 22 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index aa92cae9b4e..e973cfcf7f7 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -74,12 +74,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_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 "12" 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) @@ -242,8 +236,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 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_COMBINED STREQUAL "fedora 36") diff --git a/dist/vespa.spec b/dist/vespa.spec index 813db642424..4b4c82c436b 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -171,13 +171,9 @@ BuildRequires: openssl-devel BuildRequires: vespa-lz4-devel >= 1.9.2-2 BuildRequires: vespa-onnxruntime-devel = 1.12.1 BuildRequires: vespa-libzstd-devel >= 1.4.5-2 -%if 0%{?fc34} -BuildRequires: protobuf-devel %if 0%{?amzn2022} +BuildRequires: protobuf-devel BuildRequires: llvm-devel >= 13.0.0 -%else -BuildRequires: llvm-devel >= 12.0.0 -%endif BuildRequires: boost-devel >= 1.75 BuildRequires: gtest-devel BuildRequires: gmock-devel @@ -335,12 +331,8 @@ Requires: gtest %endif %if 0%{?fedora} Requires: gtest -%if 0%{?fc34} %if 0%{?amzn2022} %define _vespa_llvm_version 13 -%else -%define _vespa_llvm_version 12 -%endif %endif %if 0%{?fc35} %define _vespa_llvm_version 13 @@ -469,12 +461,8 @@ Requires: protobuf %endif %if 0%{?fedora} Requires: protobuf -%if 0%{?fc34} %if 0%{?amzn2022} Requires: llvm-libs >= 13.0.0 -%else -Requires: llvm-libs >= 12.0.0 -%endif %endif %if 0%{?fc35} Requires: llvm-libs >= 13.0.0 @@ -584,7 +572,7 @@ nearest neighbor search used for low-level benchmarking. %endif %else %setup -q -%if ( 0%{?el8} || 0%{?fc34} ) && %{_vespa_llvm_version} < 13 +%if 0%{?el8} && %{_vespa_llvm_version} < 13 if grep -qs 'result_pair<R>(' /usr/include/llvm/ADT/STLExtras.h then patch /usr/include/llvm/ADT/STLExtras.h < dist/STLExtras.h.diff |