jjb: lttng-tools: disable -Wmissing-field-initializers on sles12sp5

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

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 37763e65cbbdbc5d78f2bd4d52f4066b2916fb7d..8f667c59044117b9c997ed224755bd42e530326e 100755 (executable)
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -196,7 +196,7 @@ freebsd)
     export NPROC=nproc
     export PYTHON="python3"
     export PYTHON_CONFIG="python3-config"
-    export CLASSPATH='/usr/share/java/*'
+    export CLASSPATH='/usr/share/java/log4j-api.jar:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar'
     ;;
 esac
 
@@ -231,6 +231,11 @@ agents)
     echo "Java and Python agents configuration"
 
     CONF_OPTS+=("--enable-java-agent-all" "--enable-jni-interface" "--enable-python-agent")
+
+    # Explicitly add '--enable-java-agent-log4j2', it's not part of '-all' in stable 2.12/2.13
+    if verlt "$PACKAGE_VERSION" "2.14"; then
+           CONF_OPTS+=("--enable-java-agent-log4j2")
+    fi
     ;;
 
 debug-rcu)