-#!/bin/bash -exu
+#!/bin/bash
#
# Copyright (C) 2015 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
# Copyright (C) 2020 Michael Jeanson <mjeanson@efficios.com>
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -exu
+
# Version compare functions
vercomp () {
set +u
export LDFLAGS="-L$DEPS_LIB"
export JAVA_HOME="/usr/lib/jvm/default-java"
-export CLASSPATH="$DEPS_JAVA/*:/usr/share/java/*"
+export CLASSPATH="$DEPS_JAVA/*:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar"
SRCDIR="$WORKSPACE/src/lttng-tools"
OUTDIR="$WORKSPACE/out"
export PYTHON="$PYTHON3"
export PYTHON_CONFIG="/usr/bin/$PYTHON3-config"
-P2_VERSION=$($PYTHON2 -c "import sys;print(sys.version[:3])")
-P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
+P2_VERSION=$($PYTHON2 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
+P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
UST_PYTHON2="$WORKSPACE/deps/build/lib/python$P2_VERSION/site-packages"
UST_PYTHON3="$WORKSPACE/deps/build/lib/python$P3_VERSION/site-packages"