projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jjb: Use the https protocol for checkouts on Github, it's faster
[lttng-ci.git]
/
scripts
/
lttng-tools
/
build.sh
diff --git
a/scripts/lttng-tools/build.sh
b/scripts/lttng-tools/build.sh
index 2ead92bae00382aaeaa06bb21811615b2ba5d172..b44dd2c82098f470440890973a9ce5fed8b77288 100755
(executable)
--- a/
scripts/lttng-tools/build.sh
+++ b/
scripts/lttng-tools/build.sh
@@
-2,7
+2,7
@@
# shellcheck disable=SC2103
#
# Copyright (C) 2016 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
# shellcheck disable=SC2103
#
# Copyright (C) 2016 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
-#
2016-2019
Michael Jeanson <mjeanson@efficios.com>
+#
Copyright (C) 2016-2020
Michael Jeanson <mjeanson@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
#
# 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
@@
-261,6
+261,14
@@
full)
;;
esac
;;
esac
+# If we have modules, build them
+if [ -d "$WORKSPACE/src/lttng-modules" ]; then
+ cd "$WORKSPACE/src/lttng-modules"
+ $MAKE -j"$($NPROC)" V=1
+ $MAKE modules_install V=1
+ depmod
+fi
+
# Enter the source directory
cd "$SRCDIR"
# Enter the source directory
cd "$SRCDIR"
@@
-282,6
+290,8
@@
fi
# Most build configs require the python bindings
CONF_OPTS=("--prefix=$PREFIX" "--enable-python-bindings")
# Most build configs require the python bindings
CONF_OPTS=("--prefix=$PREFIX" "--enable-python-bindings")
+DIST_CONF_OPTS=()
+
# Set configure options and environment variables for each build
# configuration.
case "$conf" in
# Set configure options and environment variables for each build
# configuration.
case "$conf" in
@@
-294,6
+304,7
@@
static)
no-ust)
echo "Build without UST support"
CONF_OPTS+=("$NO_UST")
no-ust)
echo "Build without UST support"
CONF_OPTS+=("$NO_UST")
+ DIST_CONF_OPTS+=("$NO_UST")
;;
agents)
;;
agents)
@@
-347,7
+358,7
@@
dist)
# Run configure and generate the tar file
# in the source directory
# Run configure and generate the tar file
# in the source directory
- ./configure
+ ./configure
"${DIST_CONF_OPTS[@]}"
$MAKE dist
# Create and enter a temporary build directory
$MAKE dist
# Create and enter a temporary build directory
@@
-370,7
+381,7
@@
oot-dist)
cd "$builddir"
# Run configure out of tree and generate the tar file
cd "$builddir"
# Run configure out of tree and generate the tar file
- "$SRCDIR/configure"
+ "$SRCDIR/configure"
"${DIST_CONF_OPTS[@]}"
$MAKE dist
dist_srcdir="$(mktemp -d)"
$MAKE dist
dist_srcdir="$(mktemp -d)"
This page took
0.023156 seconds
and
4
git commands to generate.