From 8a7ee81ad9f9760b2f5e9dfb293a23f1c5fed1b6 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Thu, 20 Jan 2022 14:31:49 +0100 Subject: [PATCH] [SPI-2071]: update java, add switch for aarch64 tarball --- cmake/toolchain/heptools-dev-base.cmake | 2 +- externals/CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index 87012f391..af193ece8 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -253,7 +253,7 @@ LCG_external_package(itk_segmentation 5.2.0 if(NOT ${LCG_OS} STREQUAL slc) LCG_external_package(itkwidgets 0.32.0 ) endif() -LCG_external_package(java 8u222 ) +LCG_external_package(java 8u312 ) LCG_external_package(jax 0.2.9 ) LCG_external_package(jaxlib 0.1.59 ) LCG_external_package(jedi 0.18.0 ) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index b4f7eebc6..812b3b9f8 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -837,9 +837,13 @@ LCGPackage_Add( ) #---java------------------------------------------------------------------------------------------------- +set(JAVA_ARCH x64) +if(LCG_ARCH MATCHES "aarch64") + set(JAVA_ARCH aarch64) +endif() LCGPackage_Add( java - URL ${GenURL}/openjdk-${java_native_version}-linux-x64.tar.gz + URL ${GenURL}/openjdk-${java_native_version}-linux-${JAVA_ARCH}.tar.gz CONFIGURE_COMMAND BUILD_COMMAND IF NOT APPLE THEN -- GitLab