Port to CentOS 8 stream.

3 files changed, 32 insertions, 2 deletions

diff --git a/default_build_settings.cmake b/default_build_settings.cmake
index 919bc0222cd..4bd2509d8f7 100644
--- a/default_build_settings.cmake
+++ b/default_build_settings.cmake
@@ -31,7 +31,11 @@ endfunction()
 function(setup_vespa_default_build_settings_centos_8)
   message("-- Setting up default build settings for centos 8")
   set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE)
-  set(DEFAULT_VESPA_LLVM_VERSION "10" PARENT_SCOPE)
+  if (VESPA_OS_DISTRO_NAME STREQUAL "CentOS Stream")
+    set(DEFAULT_VESPA_LLVM_VERSION "11" PARENT_SCOPE)
+  else()
+    set(DEFAULT_VESPA_LLVM_VERSION "10" PARENT_SCOPE)
+  endif()
 endfunction()
 
 function(setup_vespa_default_build_settings_darwin)
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 0548ced1014..6e154a64a80 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -41,11 +41,21 @@ BuildRequires: rh-maven35
 %define _rhmaven35_enable /opt/rh/rh-maven35/enable
 %endif
 %if 0%{?el8}
+%if 0%{?centos}
+%global _centos_stream %(grep -qs '^NAME="CentOS Stream"' /etc/os-release && echo 1 || echo 0)
+%endif
+%if 0%{?_centos_stream}
+BuildRequires: gcc-toolset-10-gcc-c++
+BuildRequires: gcc-toolset-10-binutils
+%define _devtoolset_enable /opt/rh/gcc-toolset-10/enable
+BuildRequires: vespa-boost-devel >= 1.75.0-1
+%else
 BuildRequires: gcc-toolset-9-gcc-c++
 BuildRequires: gcc-toolset-9-binutils
-BuildRequires: maven
 %define _devtoolset_enable /opt/rh/gcc-toolset-9/enable
 %endif
+BuildRequires: maven
+%endif
 %if 0%{?fedora}
 BuildRequires: gcc-c++
 BuildRequires: libatomic
@@ -64,7 +74,11 @@ BuildRequires: vespa-libzstd-devel >= 1.4.5-2
 %endif
 %if 0%{?el8}
 BuildRequires: cmake >= 3.11.4-3
+%if 0%{?_centos_stream}
+BuildRequires: llvm-devel >= 11.0.0
+%else
 BuildRequires: llvm-devel >= 10.0.1
+%endif
 BuildRequires: boost-devel >= 1.66
 BuildRequires: openssl-devel
 BuildRequires: vespa-gtest >= 1.8.1-1
@@ -181,8 +195,13 @@ Requires: vespa-zstd >= 1.4.5-2
 %define _extra_include_directory /usr/include/llvm7.0;%{_vespa_deps_prefix}/include;/usr/include/openblas
 %endif
 %if 0%{?el8}
+%if 0%{?_centos_stream}
+Requires: llvm-libs >= 11.0.0
+%define _vespa_llvm_version 11
+%else
 Requires: llvm-libs >= 10.0.1
 %define _vespa_llvm_version 10
+%endif
 Requires: openssl-libs
 Requires: vespa-lz4 >= 1.9.2-2
 Requires: vespa-onnxruntime = 1.4.0
diff --git a/functions.cmake b/functions.cmake
index 0152554669a..9fa1f326e0a 100644
--- a/functions.cmake
+++ b/functions.cmake
@@ -711,6 +711,10 @@ function(vespa_detect_build_platform)
         message(FATAL_ERROR "-- Could not determine ${OS_DISTRO} version")
       endif()
     endif()
+    file(STRINGS /etc/os-release OS_DISTRO_NAME REGEX "^NAME=")
+    if (OS_DISTRO_NAME)
+      string(REGEX REPLACE "NAME=\"?([^\"]+)\"?" "\\1" OS_DISTRO_NAME ${OS_DISTRO_NAME})
+    endif()
   elseif(EXISTS /etc/redhat-release)
     set(OS_DISTRO "rhel")
     file(STRINGS "/etc/redhat-release" OS_DISTRO_VERSION)
@@ -724,6 +728,9 @@ function(vespa_detect_build_platform)
     set(VESPA_OS_DISTRO_VERSION ${OS_DISTRO_VERSION} PARENT_SCOPE)
     string(CONCAT OS_DISTRO_COMBINED ${OS_DISTRO} " " ${OS_DISTRO_VERSION})
     set(VESPA_OS_DISTRO_COMBINED ${OS_DISTRO_COMBINED} PARENT_SCOPE)
+    if (OS_DISTRO_NAME)
+      set(VESPA_OS_DISTRO_NAME ${OS_DISTRO_NAME} PARENT_SCOPE)
+    endif()
   else()
     message(FATAL_ERROR "-- Could not determine vespa build platform")
   endif()