X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=scripts%2Flttng-ust%2Fbuild.sh;h=68fd2da49a71ea5ff20433f7cf1851df4625f4ce;hb=edb65c65fb7185bdb0b29513fba19e6348bb76f3;hp=625b285fe7545a7374013838df080c794b5ba796;hpb=05615fb2bf814a91967420d9745d920670b4e15c;p=lttng-ci.git diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh index 625b285..68fd2da 100755 --- a/scripts/lttng-ust/build.sh +++ b/scripts/lttng-ust/build.sh @@ -186,7 +186,7 @@ freebsd*) export PYTHON="python3" export PYTHON_CONFIG="python3-config" export CLASSPATH='/usr/local/share/java/classes/*' - export JAVA_HOME='/usr/local/openjdk11' + export JAVA_HOME='/usr/local/openjdk17' ;; *) @@ -199,8 +199,19 @@ freebsd*) ;; esac +if [[ -f /etc/products.d/SLES.prod ]] ; then + export JAVA_HOME="/usr/${LIBDIR_ARCH}/jvm/java-1.8.0-openjdk-1.8.0" + export PATH="/usr/${LIBDIR_ARCH}/jvm/java-1.8.0-openjdk-1.8.0/bin:/usr/${LIBDIR_ARCH}/jvm/jre-1.8.0-openjdk/bin:${PATH}" + # Used by automake + SLES_VERSION="$(grep -E '' /etc/products.d/SLES.prod | grep -E -o '[0-9]+\.[0-9]+')" + if vergte "${SLES_VERSION}" "15.5" ; then + export CLASSPATH='/usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:/usr/share/java/log4j12/log4j-12.jar' + fi +fi + # Print build env details print_header "Build environment details" +print_hardware || true print_os || true print_tooling || true