X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-ivc%2Fbuild.sh;h=62069a4f7616fb5364f383b8044b3bb3e4d805c5;hb=abdf6988d6ed87e9de5886686f818a4f86d454b3;hp=75e4311db25c86fb278d09e179aee24b4dd5564c;hpb=23a9e184b4d24631d62c68050fd27e6437c498d5;p=lttng-ci.git

diff --git a/scripts/lttng-ivc/build.sh b/scripts/lttng-ivc/build.sh
index 75e4311..62069a4 100644
--- a/scripts/lttng-ivc/build.sh
+++ b/scripts/lttng-ivc/build.sh
@@ -1,6 +1,6 @@
-#!/bin/bash -xu
+#!/bin/bash
 #
-# Copyright (C) 2017 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2017 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,27 +15,18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-PYTHON3="python3"
-P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
-
-URCU_INCS=${WORKSPACE}/deps/liburcu/build/include
-URCU_LIBS=${WORKSPACE}/deps/liburcu/build/lib
-URCU_PKG_CONFIG=${URCU_LIBS}/pkgconfig
+set -xu
 
-# Get liburcu setup
-export LD_LIBRARY_PATH="$URCU_LIBS:${LD_LIBRARY_PATH:-}"
-export CPPFLAGS="${CPPFLAGS:-} -I$URCU_INCS"
-export LDFLAGS="${LDFLAGS:-} -L$URCU_LIBS"
-export PKG_CONFIG_PATH="$URCU_PKG_CONFIG:${PKG_CONFIG_PATH:-}"
+PYTHON3="python3"
 
 # Tox does not support long path venv for whatever reason.
 PYENV_HOME=$(mktemp -d)
 
-
 # Create virtualenv and install necessary packages
 virtualenv --system-site-packages -p $PYTHON3 "$PYENV_HOME"
 
 set +ux
+# shellcheck disable=SC1091
 . "$PYENV_HOME/bin/activate"
 set -ux
 
@@ -45,12 +36,16 @@ pip install --quiet tox
 TOXWORKDIR=$(mktemp -d)
 export TOXWORKDIR
 
-cd src/
+cd src/ || exit 1
+
+# Required to build tools < 2.11 with GCC >= 10
+export CFLAGS="-fcommon"
 
 # Run test suite via tox
 tox -v -- --junit-xml="${WORKSPACE}/result.xml"
 
 # Remove base venv
+deactivate
 rm -rf "$PYENV_HOME"
 
 # Save