diff options
| -rw-r--r-- | default_build_settings.cmake | 6 | ||||
| -rw-r--r-- | dist/vespa.spec | 23 |
2 files changed, 23 insertions, 6 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 50d262143b6..df55ce727f9 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -90,7 +90,7 @@ endfunction() function(setup_vespa_default_build_settings_amzn_2022) message("-- Setting up default build settings for amzn 2022") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "13" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "14" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_ubuntu) @@ -386,7 +386,9 @@ function(vespa_use_default_java_home) execute_process(COMMAND "/usr/libexec/java_home" OUTPUT_VARIABLE DEFAULT_JAVA_HOME) string(STRIP "${DEFAULT_JAVA_HOME}" DEFAULT_JAVA_HOME) elseif(VESPA_OS_DISTRO STREQUAL "ubuntu" OR VESPA_OS_DISTRO STREQUAL "debian") - set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-17-openjdk-amd64" PARENT_SCOPE) + set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-17-openjdk-amd64") + elseif(VESPA_OS_DISTRO STREQUAL "amzn") + set(DEFAULT_JAVA_HOME "/usr/lib/jvm/java-17-amazon-corretto") endif() if(COMMAND vespa_use_specific_java_home) vespa_use_specific_java_home() diff --git a/dist/vespa.spec b/dist/vespa.spec index 275cbbea32c..e07e5ba83a6 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -123,16 +123,21 @@ BuildRequires: gmock-devel %if 0%{?fedora} BuildRequires: cmake >= 3.9.1 BuildRequires: maven -%if %{?fedora} >= 35 && ! 0%{?amzn2022} +%if 0%{?amzn2022} +BuildRequires: maven-amazon-corretto17 +%define _java_home /usr/lib/jvm/java-17-amazon-corretto +%else +%if %{?fedora} >= 35 BuildRequires: maven-openjdk17 %endif +%endif BuildRequires: openssl-devel BuildRequires: vespa-lz4-devel >= 1.9.2-2 BuildRequires: vespa-onnxruntime-devel = 1.12.1 BuildRequires: vespa-libzstd-devel >= 1.4.5-2 %if 0%{?amzn2022} BuildRequires: protobuf-devel -BuildRequires: llvm-devel >= 13.0.0 +BuildRequires: llvm-devel >= 14.0.5 BuildRequires: boost-devel >= 1.75 BuildRequires: gtest-devel BuildRequires: gmock-devel @@ -181,7 +186,12 @@ BuildRequires: re2-devel %endif BuildRequires: zlib-devel BuildRequires: libicu-devel +%if 0%{?amzn2022} +BuildRequires: java-17-amazon-corretto-devel +BuildRequires: java-17-amazon-corretto +%else BuildRequires: java-17-openjdk-devel +%endif BuildRequires: rpm-build BuildRequires: make BuildRequires: git @@ -254,7 +264,7 @@ Requires: gtest %if 0%{?fedora} Requires: gtest %if 0%{?amzn2022} -%define _vespa_llvm_version 13 +%define _vespa_llvm_version 14 %endif %if 0%{?fc35} %define _vespa_llvm_version 13 @@ -294,7 +304,12 @@ Vespa - The open big data serving engine Summary: Vespa - The open big data serving engine - base +%if 0%{?amzn2022} +Requires: java-17-amazon-corretto-devel +Requires: java-17-amazon-corretto +%else Requires: java-17-openjdk-devel +%endif Requires: perl Requires: perl-Getopt-Long Requires(pre): shadow-utils @@ -370,7 +385,7 @@ Requires: protobuf %if 0%{?fedora} Requires: protobuf %if 0%{?amzn2022} -Requires: llvm-libs >= 13.0.0 +Requires: llvm-libs >= 14.0.5 %endif %if 0%{?fc35} Requires: llvm-libs >= 13.0.0 |