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 python3.9 explicitly on MacOS
[lttng-ci.git]
/
scripts
/
liburcu
/
build.sh
diff --git
a/scripts/liburcu/build.sh
b/scripts/liburcu/build.sh
index 7d2951e20fcd5318942e7b6bb5dc01c172ab10c2..edf47953290901d4226463f5ffd524b4ebbb6406 100755
(executable)
--- a/
scripts/liburcu/build.sh
+++ b/
scripts/liburcu/build.sh
@@
-1,7
+1,7
@@
-#!/bin/bash
-exu
+#!/bin/bash
#
# Copyright (C) 2015 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
#
# Copyright (C) 2015 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
@@
-16,6
+16,8
@@
# 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/>.
+set -exu
+
# Version compare functions
vercomp () {
set +u
# Version compare functions
vercomp () {
set +u
@@
-69,6
+71,16
@@
verne() {
[ "$res" -ne "0" ]
}
[ "$res" -ne "0" ]
}
+failed_configure() {
+ # Assume we are in the configured build directory
+ echo "#################### BEGIN config.log ####################"
+ cat config.log
+ echo "#################### END config.log ####################"
+
+ # End the build with failure
+ exit 1
+}
+
# Required variables
WORKSPACE=${WORKSPACE:-}
# Required variables
WORKSPACE=${WORKSPACE:-}
@@
-169,20
+181,31
@@
sol11-i386)
export MAKE=gmake
export TAR=gtar
export NPROC=nproc
export MAKE=gmake
export TAR=gtar
export NPROC=nproc
- export PATH="$PATH:/usr/perl5/bin"
+ export PATH="
/opt/csw/bin:
$PATH:/usr/perl5/bin"
export LD_ALTEXEC=/usr/bin/gld
export LD=/usr/bin/gld
export PYTHON="python3"
export PYTHON_CONFIG="python3-config"
export LD_ALTEXEC=/usr/bin/gld
export LD=/usr/bin/gld
export PYTHON="python3"
export PYTHON_CONFIG="python3-config"
+ export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
;;
;;
-macos
x
)
+macos
*
)
export MAKE=make
export TAR=tar
export NPROC="getconf _NPROCESSORS_ONLN"
export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
export CPPFLAGS="-I/opt/local/include"
export LDFLAGS="-L/opt/local/lib"
export MAKE=make
export TAR=tar
export NPROC="getconf _NPROCESSORS_ONLN"
export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
export CPPFLAGS="-I/opt/local/include"
export LDFLAGS="-L/opt/local/lib"
+ export PYTHON="python3.9"
+ export PYTHON_CONFIG="python3.9-config"
+ ;;
+
+freebsd)
+ export MAKE=gmake
+ export TAR=tar
+ export NPROC="getconf _NPROCESSORS_ONLN"
+ export CPPFLAGS="-I/usr/local/include"
+ export LDFLAGS="-L/usr/local/lib"
export PYTHON="python3"
export PYTHON_CONFIG="python3-config"
;;
export PYTHON="python3"
export PYTHON_CONFIG="python3-config"
;;
@@
-196,6
+219,10
@@
macosx)
;;
esac
;;
esac
+# Print build env details
+print_os || true
+print_tooling || true
+
# Enter the source directory
cd "$SRCDIR"
# Enter the source directory
cd "$SRCDIR"
@@
-256,7
+283,7
@@
oot)
builddir=$(mktemp -d)
cd "$builddir"
builddir=$(mktemp -d)
cd "$builddir"
- "$SRCDIR/configure" "${CONF_OPTS[@]}"
+ "$SRCDIR/configure" "${CONF_OPTS[@]}"
|| failed_configure
;;
dist)
;;
dist)
@@
-264,7
+291,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
|| failed_configure
$MAKE dist
# Create and enter a temporary build directory
$MAKE dist
# Create and enter a temporary build directory
@@
-276,7
+303,7
@@
dist)
$TAR xvf "$SRCDIR"/*.tar.* --strip 1
# Build in extracted source tree
$TAR xvf "$SRCDIR"/*.tar.* --strip 1
# Build in extracted source tree
- ./configure "${CONF_OPTS[@]}"
+ ./configure "${CONF_OPTS[@]}"
|| failed_configure
;;
oot-dist)
;;
oot-dist)
@@
-287,7
+314,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"
|| failed_configure
$MAKE dist
dist_srcdir="$(mktemp -d)"
$MAKE dist
dist_srcdir="$(mktemp -d)"
@@
-303,12
+330,12
@@
oot-dist)
# Run configure from the extracted distribution tar,
# out of the source tree
# Run configure from the extracted distribution tar,
# out of the source tree
- "$dist_srcdir/configure" "${CONF_OPTS[@]}"
+ "$dist_srcdir/configure" "${CONF_OPTS[@]}"
|| failed_configure
;;
*)
echo "Standard in-tree build"
;;
*)
echo "Standard in-tree build"
- ./configure "${CONF_OPTS[@]}"
+ ./configure "${CONF_OPTS[@]}"
|| failed_configure
;;
esac
;;
esac
This page took
0.023683 seconds
and
4
git commands to generate.