diff options
| -rw-r--r-- | build_settings.cmake | 3 | ||||
| -rw-r--r-- | default_build_settings.cmake | 8 | ||||
| -rw-r--r-- | dist/vespa.spec | 18 |
3 files changed, 25 insertions, 4 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index 10f4c7ff926..8dcef41caff 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -55,6 +55,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" ST else() set(CXX_SPECIFIC_WARN_OPTS "-Wnoexcept -Wsuggest-override -Wnon-virtual-dtor -Wformat-security") if(VESPA_OS_DISTRO_COMBINED STREQUAL "centos 8" OR + (VESPA_OS_DISTRO STREQUAL "rocky" AND + VESPA_OS_DISTRO_VERSION VERSION_GREATER_EQUAL "8" AND + VESPA_OS_DISTRO_VERSION VERSION_LESS "9") OR (VESPA_OS_DISTRO STREQUAL "rhel" AND VESPA_OS_DISTRO_VERSION VERSION_GREATER_EQUAL "8" AND VESPA_OS_DISTRO_VERSION VERSION_LESS "9")) diff --git a/default_build_settings.cmake b/default_build_settings.cmake index a61410ebf31..f034c9260e4 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -34,6 +34,12 @@ function(setup_vespa_default_build_settings_centos_8) set(DEFAULT_VESPA_LLVM_VERSION "11" PARENT_SCOPE) endfunction() +function(setup_vespa_default_build_settings_rocky_8_4) + message("-- Setting up default build settings for rocky 8.4") + set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "11" PARENT_SCOPE) +endfunction() + function(setup_vespa_default_build_settings_darwin) message("-- Setting up default build settings for darwin") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") @@ -187,6 +193,8 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_centos_7() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "centos 8") setup_vespa_default_build_settings_centos_8() + elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "rocky 8.4") + setup_vespa_default_build_settings_rocky_8_4() elseif(VESPA_OS_DISTRO STREQUAL "darwin") setup_vespa_default_build_settings_darwin() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 32") diff --git a/dist/vespa.spec b/dist/vespa.spec index 13ea9a733e1..7bee7e2a8d0 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -27,8 +27,10 @@ License: Commercial URL: http://vespa.ai Source0: vespa-%{version}.tar.gz -%if 0%{?centos} +%if 0%{?centos} || 0%{?rocky} BuildRequires: epel-release +%endif +%if 0%{?centos} %if 0%{?el7} && ! 0%{?amzn2} BuildRequires: centos-release-scl %endif @@ -62,6 +64,7 @@ BuildRequires: maven BuildRequires: pybind11-devel BuildRequires: python3-pytest BuildRequires: python36-devel +BuildRequires: glibc-langpack-en %endif %if 0%{?fedora} BuildRequires: gcc-c++ @@ -69,6 +72,7 @@ BuildRequires: libatomic BuildRequires: pybind11-devel BuildRequires: python3-pytest BuildRequires: python3-devel +BuildRequires: glibc-langpack-en %endif %if 0%{?el7} BuildRequires: cmake3 @@ -92,9 +96,11 @@ BuildRequires: vespa-libzstd-devel >= 1.4.5-2 %endif %if 0%{?el8} BuildRequires: cmake >= 3.11.4-3 +%if 0%{?centos} || 0%{?rocky} %if 0%{?centos} # Current cmake on CentOS 8 is broken and manually requires libarchive install BuildRequires: libarchive +%endif %define _command_cmake cmake BuildRequires: (llvm-devel >= 11.0.0 and llvm-devel < 12) %else @@ -219,7 +225,7 @@ Requires: vespa-valgrind >= 3.17.0-1 %endif %endif %if 0%{?el8} -%if 0%{?centos} +%if 0%{?centos} || 0%{?rocky} %define _vespa_llvm_version 11 %else %define _vespa_llvm_version 10 @@ -290,7 +296,7 @@ Vespa - The open big data serving engine - base Summary: Vespa - The open big data serving engine - base C++ libraries -%if 0%{?centos} +%if 0%{?centos} || 0%{?rocky} Requires: epel-release %endif %if 0%{?amzn2} @@ -307,6 +313,7 @@ Requires: vespa-lz4 >= 1.9.2-2 Requires: vespa-libzstd >= 1.4.5-2 %if 0%{?el8} Requires: openblas +Requires: glibc-langpack-en %else %if 0%{?amzn2} Requires: vespa-openblas = 0.3.15 @@ -319,6 +326,9 @@ Requires: vespa-re2 = 20190801 %else Requires: re2 %endif +%if 0%{?fedora} +Requires: glibc-langpack-en +%endif %description base-libs @@ -347,7 +357,7 @@ Requires: libicu Requires: openssl-libs %endif %if 0%{?el8} -%if 0%{?centos} +%if 0%{?centos} || 0%{?rocky} Requires: (llvm-libs >= 11.0.0 and llvm-libs < 12) %else Requires: (llvm-libs >= 10.0.1 and llvm-libs < 11) |