diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2020-04-03 13:00:58 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-04-03 13:00:58 +0200 |
commit | 9a09c0ed5313a4adbd995f2c482ebdc60bba90b9 (patch) | |
tree | ac9857036a3ee1118ca64e72bd7165e323007cb2 | |
parent | 49413ece8a980c07bf4906233cd221c41d2dc91d (diff) |
Remove support for Fedora 29, which has been EOL for some time now.
-rw-r--r-- | default_build_settings.cmake | 8 | ||||
-rw-r--r-- | dist/vespa.spec | 12 |
2 files changed, 0 insertions, 20 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index a23a8f1489a..622755495c2 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -56,12 +56,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_29) - message("-- Setting up default build settings for fedora 29") - set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "7" 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) @@ -171,8 +165,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 29") - setup_vespa_default_build_settings_fedora_29() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 30") setup_vespa_default_build_settings_fedora_30() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 31") diff --git a/dist/vespa.spec b/dist/vespa.spec index c89cd42df0f..ba57b1f8c40 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -68,13 +68,6 @@ BuildRequires: vespa-protobuf-devel >= 3.7.0-4 BuildRequires: cmake >= 3.9.1 BuildRequires: maven BuildRequires: openssl-devel -%if 0%{?fc29} -BuildRequires: vespa-protobuf-devel >= 3.7.0-4 -BuildRequires: llvm-devel >= 7.0.0 -BuildRequires: boost-devel >= 1.66 -BuildRequires: gtest-devel -BuildRequires: gmock-devel -%endif %if 0%{?fc30} BuildRequires: vespa-protobuf-devel >= 3.7.0-4 BuildRequires: llvm-devel >= 8.0.0 @@ -180,11 +173,6 @@ Requires: openssl-libs %endif %if 0%{?fedora} Requires: openssl-libs -%if 0%{?fc29} -Requires: vespa-protobuf >= 3.7.0-4 -Requires: llvm-libs >= 7.0.0 -%define _vespa_llvm_version 7 -%endif %if 0%{?fc30} Requires: vespa-protobuf >= 3.7.0-4 Requires: llvm-libs >= 8.0.0 |