From b7b61fcb509f26ec4498d1d2c2e255c52bfb11ed Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 27 Mar 2023 17:35:47 -0400 Subject: [PATCH] jjb: lttng-tools: sles15sp4 doesn't have python2 Change-Id: Iace681136f0c3dc152a7d07dc1d459dd3d5a0dd4 Signed-off-by: Michael Jeanson --- scripts/lttng-tools/build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index 3b0eb9d..0476695 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -353,12 +353,19 @@ agents) export JAVA_HOME="/usr/lib/jvm/default-java" 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" - CONF_OPTS+=("--enable-test-java-agent-all" "--enable-test-python-agent-all") + CONF_OPTS+=("--enable-test-java-agent-all") # Explicitly add '--enable-test-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-test-java-agent-log4j2") fi + + # Some distros don't ship python2 anymore + if command -v $PYTHON2 >/dev/null 2>&1; then + CONF_OPTS+=("--enable-test-python-agent-all") + else + CONF_OPTS+=("--enable-test-python3-agent") + fi ;; relayd-only) -- 2.34.1