Fedora 32 has been branched from Fedora rawhide.

Add setting for Ubuntu 19.10, drop setting for Ubuntu 18.10.

2 files changed, 35 insertions, 9 deletions

diff --git a/default_build_settings.cmake b/default_build_settings.cmake
index e29e4c32017..a23a8f1489a 100644
--- a/default_build_settings.cmake
+++ b/default_build_settings.cmake
@@ -80,11 +80,17 @@ function(setup_vespa_default_build_settings_fedora_32)
   set(DEFAULT_VESPA_LLVM_VERSION "10" PARENT_SCOPE)
 endfunction()
 
-function(setup_vespa_default_build_settings_ubuntu_18_10)
-  message("-- Setting up default build settings for ubuntu 18.10")
-  set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib" "/usr/lib/llvm-6.0/lib" PARENT_SCOPE)
-  set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/lib/llvm-6.0/include" PARENT_SCOPE)
-  set(DEFAULT_VESPA_LLVM_VERSION "6.0" PARENT_SCOPE)
+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 "10" PARENT_SCOPE)
+endfunction()
+
+function(setup_vespa_default_build_settings_ubuntu_19_10)
+  message("-- Setting up default build settings for ubuntu 19.10")
+  set(DEFAULT_EXTRA_LINK_DIRECTORY "${VESPA_DEPS}/lib" "/usr/lib/llvm-9/lib" PARENT_SCOPE)
+  set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/lib/llvm-9/include" PARENT_SCOPE)
+  set(DEFAULT_VESPA_LLVM_VERSION "9" PARENT_SCOPE)
 endfunction()
 
 function(vespa_use_default_vespa_unprivileged)
@@ -173,8 +179,10 @@ function(vespa_use_default_build_settings)
     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 "ubuntu 18.10")
-    setup_vespa_default_build_settings_ubuntu_18_10()
+  elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 33")
+    setup_vespa_default_build_settings_fedora_33()
+  elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "ubuntu 19.10")
+    setup_vespa_default_build_settings_ubuntu_19_10()
   else()
     message(FATAL_ERROR "-- Unkonwn vespa build platform ${VESPA_OS_DISTRO_COMBINED}")
   endif()
diff --git a/dist/vespa.spec b/dist/vespa.spec
index c54e4442167..8ce494fd7cb 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -60,27 +60,37 @@ BuildRequires: vespa-protobuf-devel >= 3.7.0-4
 %if 0%{?fedora}
 BuildRequires: cmake >= 3.9.1
 BuildRequires: maven
-BuildRequires: vespa-protobuf-devel >= 3.7.0-4
 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
 BuildRequires: boost-devel >= 1.69
 BuildRequires: gtest-devel
 BuildRequires: gmock-devel
 %endif
 %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
+BuildRequires: boost-devel >= 1.69
+BuildRequires: gtest-devel
+BuildRequires: gmock-devel
+%endif
+%if 0%{?fc33}
+BuildRequires: protobuf-devel
 BuildRequires: llvm-devel >= 10.0.0
 BuildRequires: boost-devel >= 1.69
 BuildRequires: gtest-devel
@@ -159,21 +169,29 @@ Requires: openssl-libs
 %define _extra_include_directory %{_vespa_deps_prefix}/include;/usr/include/openblas
 %endif
 %if 0%{?fedora}
-Requires: vespa-protobuf >= 3.7.0-4
 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
 %define _vespa_llvm_version 8
 %endif
 %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
+%define _vespa_llvm_version 10
+%endif
+%if 0%{?fc33}
+Requires: protobuf
 Requires: llvm-libs >= 10.0.0
 %define _vespa_llvm_version 10
 %endif