X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fbuild.sh;h=6c9f03b0e848af63a52c7627d66002f18085e087;hb=ada7f88434517dac081a5303275a1fccc5af4488;hp=c4b4fdb084fc91bcc1a20862de9cec3f2f8048e7;hpb=19b5f29523b448661b3de264509927d1178b36da;p=lttng-ci.git diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index c4b4fdb..6c9f03b 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -327,6 +327,8 @@ agents) fi export CLASSPATH="$DEPS_JAVA/lttng-ust-agent-all.jar:/usr/share/java/log4j-api.jar:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar" 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}" 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="${DEPS_JAVA}/lttng-ust-agent-all.jar:/usr/share/java/log4j/log4j-api.jar:/usr/share/java/log4j/log4j-core.jar:/usr/share/java/log4j12/log4j-12.jar"