projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jjb: lttbg-ust: cleanup yaml job definition
[lttng-ci.git]
/
scripts
/
lttng-ust
/
build.sh
diff --git
a/scripts/lttng-ust/build.sh
b/scripts/lttng-ust/build.sh
index 37763e65cbbdbc5d78f2bd4d52f4066b2916fb7d..5f960b4847e5c736ad5194899cabd90e605ef6ca 100755
(executable)
--- a/
scripts/lttng-ust/build.sh
+++ b/
scripts/lttng-ust/build.sh
@@
-120,49
+120,17
@@
gcc)
export CC=gcc
export CXX=g++
;;
export CC=gcc
export CXX=g++
;;
-gcc-4.8)
- export CC=gcc-4.8
- export CXX=g++-4.8
- ;;
-gcc-5)
- export CC=gcc-5
- export CXX=g++-5
- ;;
-gcc-6)
- export CC=gcc-6
- export CXX=g++-6
- ;;
-gcc-7)
- export CC=gcc-7
- export CXX=g++-7
- ;;
-gcc-8)
- export CC=gcc-8
- export CXX=g++-8
+gcc-*)
+ export CC=gcc-${cc#gcc-}
+ export CXX=g++-${cc#gcc-}
;;
clang)
export CC=clang
export CXX=clang++
;;
;;
clang)
export CC=clang
export CXX=clang++
;;
-clang-3.9)
- export CC=clang-3.9
- export CXX=clang++-3.9
- ;;
-clang-4.0)
- export CC=clang-4.0
- export CXX=clang++-4.0
- ;;
-clang-5.0)
- export CC=clang-5.0
- export CXX=clang++-5.0
- ;;
-clang-6.0)
- export CC=clang-6.0
- export CXX=clang++-6.0
- ;;
-clang-7)
- export CC=clang-7
- export CXX=clang++-7
+clang-*)
+ export CC=clang-${cc#clang-}
+ export CXX=clang++-${cc#clang-}
;;
*)
if [ "x$cc" != "x" ]; then
;;
*)
if [ "x$cc" != "x" ]; then
@@
-178,7
+146,7
@@
fi
# Set platform variables
case "$arch" in
# Set platform variables
case "$arch" in
-freebsd)
+freebsd
*
)
export MAKE=gmake
export TAR=tar
export NPROC="getconf _NPROCESSORS_ONLN"
export MAKE=gmake
export TAR=tar
export NPROC="getconf _NPROCESSORS_ONLN"
@@
-196,7
+164,7
@@
freebsd)
export NPROC=nproc
export PYTHON="python3"
export PYTHON_CONFIG="python3-config"
export NPROC=nproc
export PYTHON="python3"
export PYTHON_CONFIG="python3-config"
- export CLASSPATH='/usr/share/java/
*
'
+ export CLASSPATH='/usr/share/java/
log4j-api.jar:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar
'
;;
esac
;;
esac
@@
-231,6
+199,11
@@
agents)
echo "Java and Python agents configuration"
CONF_OPTS+=("--enable-java-agent-all" "--enable-jni-interface" "--enable-python-agent")
echo "Java and Python agents configuration"
CONF_OPTS+=("--enable-java-agent-all" "--enable-jni-interface" "--enable-python-agent")
+
+ # Explicitly add '--enable-java-agent-log4j2', it's not part of '-all' in stable 2.12/2.13
+ if verlt "$PACKAGE_VERSION" "2.14"; then
+ CONF_OPTS+=("--enable-java-agent-log4j2")
+ fi
;;
debug-rcu)
;;
debug-rcu)
This page took
0.023014 seconds
and
4
git commands to generate.