X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-ust-benchmarks%2Fbuild.sh;h=635aae5fc638eef65687e53ea876b3ad76d6c48c;hb=82a91d62571974049269652e097cc4e199888077;hp=a2799b9d1abf95a36ec01ece0868ce86457ce884;hpb=51c9c62db1805a4cdd96be18df4082f1ac5d81c5;p=lttng-ci.git diff --git a/scripts/lttng-ust-benchmarks/build.sh b/scripts/lttng-ust-benchmarks/build.sh index a2799b9..635aae5 100644 --- a/scripts/lttng-ust-benchmarks/build.sh +++ b/scripts/lttng-ust-benchmarks/build.sh @@ -25,7 +25,7 @@ rm -rf "$WORKSPACE/build" mkdir -p "$WORKSPACE/build" PYTHON3=python3 -P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])") +P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))') # liburcu URCU_INCS="$WORKSPACE/deps/liburcu/build/include/" @@ -48,7 +48,7 @@ TOOLS_BINS="$WORKSPACE/deps/lttng-tools/build/bin/" TOOLS_PY="$WORKSPACE/deps/lttng-tools/build/lib/python$P3_VERSION/site-packages/" rm -rf "$WORKSPACE/deps/lttng-modules" -git clone git://github.com/lttng/lttng-modules.git "$WORKSPACE/deps/lttng-modules" +git clone https://github.com/lttng/lttng-modules.git "$WORKSPACE/deps/lttng-modules" export CFLAGS="-I$URCU_INCS -I$UST_INCS" export LDFLAGS="-L$URCU_LIBS -L$UST_LIBS" @@ -56,6 +56,7 @@ export LD_LIBRARY_PATH="$URCU_LIBS:$UST_LIBS:$BABEL_LIBS:$TOOLS_LIBS:${LD_LIBRAR export PYTHONPATH="$TOOLS_PY:$BABEL_PY:${PYTHONPATH:-}" export PATH="$TOOLS_BINS:$UST_BINS:$PATH" export LTTNG_MODULES_DIR="$WORKSPACE/deps/lttng-modules/" +export PKG_CONFIG_PATH="$UST_LIBS/pkgconfig" export LTTNG_SESSION_CONFIG_XSD_PATH="$WORKSPACE/deps/lttng-tools/build/share/xml/lttng" export LTTNG_CONSUMERD64_BIN="$WORKSPACE/deps/lttng-tools/build/lib/lttng/libexec/lttng-consumerd"