jjb: Update java CLASSPATH for sles15sp5

[lttng-ci.git] / scripts / lttng-ust / build.sh

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index e39f29099e42082fef1ad1286a7502684c1de124..8d83d29905436ec2a621e354d0b9362997de617e 100755 (executable)
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -114,9 +114,6 @@ PREFIX="/build"
 LIBDIR="lib"
 LIBDIR_ARCH="$LIBDIR"
 
-# Force the normal Python install layout without 'local' on Debian / Ubuntu
-export DEB_PYTHON_INSTALL_LAYOUT="deb"
-
 # RHEL and SLES both use lib64 but don't bother shipping a default autoconf
 # site config that matches this.
 if [[ ( -f /etc/redhat-release || -f /etc/products.d/SLES.prod || -f /etc/yocto-release ) ]]; then
@@ -189,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'
     ;;
 
 *)
@@ -202,8 +199,16 @@ freebsd*)
     ;;
 esac
 
+if [[ -f /etc/products.d/SLES.prod ]] ; then
+    SLES_VERSION="$(grep -E '</version>' /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