X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fbuild.sh;h=7637bc0332f49f37d874342040acd7bcc38b3ca4;hb=ab123b17bb7169924cb6f3be8c1ef0a1c6133552;hp=afa8b8cc6e40e8fa5bbe2c163b0983d51950d249;hpb=09d45745e001bfa7e2d8b7e6a1b960c76a49308b;p=lttng-ci.git

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index afa8b8c..7637bc0 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -81,11 +81,13 @@ test_type=${test_type:-}
 
 DEPS_INC="$WORKSPACE/deps/build/include"
 DEPS_LIB="$WORKSPACE/deps/build/lib"
+DEPS_PKGCONFIG="$DEPS_LIB/pkgconfig"
 DEPS_BIN="$WORKSPACE/deps/build/bin"
 DEPS_JAVA="$WORKSPACE/deps/build/share/java"
 
 export PATH="$DEPS_BIN:$PATH"
 export LD_LIBRARY_PATH="$DEPS_LIB:${LD_LIBRARY_PATH:-}"
+export PKG_CONFIG_PATH="$DEPS_PKGCONFIG"
 export CPPFLAGS="-I$DEPS_INC"
 export LDFLAGS="-L$DEPS_LIB"
 
@@ -105,6 +107,19 @@ tmpdir="$(mktemp)"
 ln -sf "$TMPDIR" "$tmpdir"
 export TMPDIR="$tmpdir"
 
+# Create a symlink to "babeltrace" when the "babeltrace2" executable is found.
+# This is a temporary workaround until lttng-tools either allows the override of
+# the trace reader in its test suite or that we move to only supporting
+# babeltrace2
+if [ -x "$DEPS_BIN/babeltrace2" ]; then
+	ln -s "$DEPS_BIN/babeltrace2" "$DEPS_BIN/babeltrace"
+fi
+
+# When using babeltrace2 make sure that it finds its plugins and
+# plugin-providers.
+export BABELTRACE_PLUGIN_PATH="$DEPS_LIB/babeltrace2/plugins/"
+export LIBBABELTRACE2_PLUGIN_PROVIDER_DIR="$DEPS_LIB/babeltrace2/plugin-providers/"
+
 export CFLAGS="-g -O2"
 
 # Set compiler variables