projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jjb: lttng-ivc: remove joraj email
[lttng-ci.git]
/
scripts
/
lttng-ivc
/
build.sh
diff --git
a/scripts/lttng-ivc/build.sh
b/scripts/lttng-ivc/build.sh
index 8cc08acea45bc6dd532c513abde504e9df8453ad..c008944bf11a5985fc2d67088d812a1eb6473ca0 100644
(file)
--- a/
scripts/lttng-ivc/build.sh
+++ b/
scripts/lttng-ivc/build.sh
@@
-1,4
+1,4
@@
-#!/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>
#
@@
-15,21
+15,14
@@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# 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
+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"
+PYTHON3="python3"
+P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
# Tox does not support long path venv for whatever reason.
PYENV_HOME=$(mktemp -d)
# 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"
# Create virtualenv and install necessary packages
virtualenv --system-site-packages -p $PYTHON3 "$PYENV_HOME"
This page took
0.022723 seconds
and
4
git commands to generate.