diff options
| -rw-r--r-- | default_build_settings.cmake | 8 | ||||
| -rw-r--r-- | dist/vespa.spec | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 08f5e7d14da..266fd87c8cd 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -38,6 +38,12 @@ function(setup_vespa_default_build_settings_almalinux_9_0) set(DEFAULT_VESPA_LLVM_VERSION "13" PARENT_SCOPE) endfunction() +function(setup_vespa_default_build_settings_oraclelinux_8_6) + message("-- Setting up default build settings for oracle linux 8.6") + set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "13" PARENT_SCOPE) +endfunction() + function(setup_vespa_default_build_settings_darwin) message("-- Setting up default build settings for darwin") set(DEFAULT_VESPA_LLVM_VERSION "15" PARENT_SCOPE) @@ -189,6 +195,8 @@ function(vespa_use_default_build_settings) setup_vespa_default_build_settings_almalinux_8_6() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "almalinux 9.0") setup_vespa_default_build_settings_almalinux_9_0() + elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "ol 8.6") + setup_vespa_default_build_settings_oraclelinux_8_6() elseif(VESPA_OS_DISTRO STREQUAL "darwin") setup_vespa_default_build_settings_darwin() elseif(VESPA_OS_DISTRO_COMBINED STREQUAL "fedora 36") diff --git a/dist/vespa.spec b/dist/vespa.spec index 8953efb82f8..189fe4ad81a 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -32,7 +32,7 @@ License: Commercial URL: http://vespa.ai Source0: vespa-%{version}.tar.gz -%if 0%{?centos} || 0%{?rocky} +%if 0%{?centos} || 0%{?rocky} || 0%{?oraclelinux} BuildRequires: epel-release %endif %if 0%{?el8} @@ -78,7 +78,7 @@ BuildRequires: glibc-langpack-en %endif %if 0%{?el8} BuildRequires: cmake >= 3.11.4-3 -%if 0%{?centos} || 0%{?rocky} +%if 0%{?centos} || 0%{?rocky} || 0%{?oraclelinux} %if 0%{?centos} # Current cmake on CentOS 8 is broken and manually requires libarchive install BuildRequires: libarchive @@ -231,7 +231,7 @@ Requires: unzip Requires: zlib Requires: zstd %if 0%{?el8} -%if 0%{?centos} || 0%{?rocky} +%if 0%{?centos} || 0%{?rocky} || 0%{?oraclelinux} %if 0%{?_centos_stream} %define _vespa_llvm_version 14 %else @@ -312,7 +312,7 @@ Vespa - The open big data serving engine - base Summary: Vespa - The open big data serving engine - base C++ libraries -%if 0%{?centos} || 0%{?rocky} +%if 0%{?centos} || 0%{?rocky} || 0%{?oraclelinux} Requires: epel-release %endif Requires: xxhash-libs >= 0.8.0 @@ -353,7 +353,7 @@ Requires: vespa-openssl >= 1.1.1o-1 Requires: openssl-libs %endif %if 0%{?el8} -%if 0%{?centos} || 0%{?rocky} +%if 0%{?centos} || 0%{?rocky} || 0%{?oraclelinux} %if 0%{?_centos_stream} Requires: (llvm-libs >= 14.0.0 and llvm-libs < 15) %else |