projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
travis: test with latest jjb
[lttng-ci.git]
/
scripts
/
liburcu
/
build.sh
diff --git
a/scripts/liburcu/build.sh
b/scripts/liburcu/build.sh
index ef97773b7ba84b4895251126eecf497d46e172d8..996e7f107bd714c115ffdb117b75f2894e07fc00 100755
(executable)
--- a/
scripts/liburcu/build.sh
+++ b/
scripts/liburcu/build.sh
@@
-1,6
+1,7
@@
#!/bin/bash -exu
#
# Copyright (C) 2015 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
#!/bin/bash -exu
#
# Copyright (C) 2015 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+# 2016 - 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
@@
-15,13
+16,34
@@
# 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/>.
+# Version compare functions
+verlte() {
+ [ "$1" = "`printf '%s\n%s' $1 $2 | sort -V | head -n1`" ]
+}
-# Create build directory
-rm -rf $WORKSPACE/build
-mkdir -p $WORKSPACE/build
+verlt() {
+ [ "$1" = "$2" ] && return 1 || verlte $1 $2
+}
+vergte() {
+ [ "$1" = "`printf '%s\n%s' $1 $2 | sort -V | tail -n1`" ]
+}
+
+vergt() {
+ [ "$1" = "$2" ] && return 1 || vergte $1 $2
+}
+
+
+SRCDIR="$WORKSPACE/src/liburcu"
+TMPDIR="$WORKSPACE/tmp"
PREFIX="$WORKSPACE/build"
PREFIX="$WORKSPACE/build"
+# Create build and tmp directories
+rm -rf "$PREFIX" "$TMPDIR"
+mkdir -p "$PREFIX" "$TMPDIR"
+
+export TMPDIR
+
# Set platform variables
case "$arch" in
solaris10)
# Set platform variables
case "$arch" in
solaris10)
@@
-67,9
+89,15
@@
tls_fallback)
esac
esac
-# Run bootstrap prior to configure
+# Enter the source directory
+cd "$SRCDIR"
+
+# Run bootstrap in the source directory prior to configure
./bootstrap
./bootstrap
+# Get source version from configure script
+eval `grep '^PACKAGE_VERSION=' ./configure`
+
# Build type
# oot : out-of-tree build
# Build type
# oot : out-of-tree build
@@
-78,14
+106,14
@@
esac
#
# Make sure to move to the build_path and configure
# before continuing
#
# Make sure to move to the build_path and configure
# before continuing
-BUILD_PATH=$
WORKSPACE
+BUILD_PATH=$
SRCDIR
case "$build" in
oot)
echo "Out of tree build"
BUILD_PATH=$WORKSPACE/oot
mkdir -p $BUILD_PATH
cd $BUILD_PATH
case "$build" in
oot)
echo "Out of tree build"
BUILD_PATH=$WORKSPACE/oot
mkdir -p $BUILD_PATH
cd $BUILD_PATH
- MAKE=$MAKE CFLAGS="$CFLAGS" $
WORKSPACE
/configure --prefix=$PREFIX $CONF_OPTS
+ MAKE=$MAKE CFLAGS="$CFLAGS" $
SRCDIR
/configure --prefix=$PREFIX $CONF_OPTS
;;
dist)
;;
dist)
@@
-93,7
+121,7
@@
dist)
BUILD_PATH=`mktemp -d`
# Initial configure and generate tarball
BUILD_PATH=`mktemp -d`
# Initial configure and generate tarball
- MAKE=$MAKE
.
/configure
+ MAKE=$MAKE
$SRCDIR
/configure
$MAKE dist
mkdir -p $BUILD_PATH
$MAKE dist
mkdir -p $BUILD_PATH
@@
-106,35
+134,35
@@
dist)
MAKE=$MAKE CFLAGS="$CFLAGS" $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
;;
*)
MAKE=$MAKE CFLAGS="$CFLAGS" $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
;;
*)
- BUILD_PATH=$WORKSPACE
- echo "Standard tree build"
- MAKE=$MAKE CFLAGS="$CFLAGS" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+ echo "Standard in-tree build"
+ MAKE=$MAKE CFLAGS="$CFLAGS" $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
;;
esac
# BUILD!
;;
esac
# BUILD!
-$MAKE -j `$NPROC`
+$MAKE -j `$NPROC`
V=1
$MAKE install
# Run tests
$MAKE check
$MAKE install
# Run tests
$MAKE check
-#if [ "$version" >=" 0.9" ]; then
+# Only run regtest for 0.9 and up
+if vergte "$PACKAGE_VERSION" "0.9"; then
$MAKE regtest
$MAKE regtest
-
#
fi
+fi
# Cleanup
$MAKE clean
# Cleanup rpath in executables and shared libraries
#find $WORKSPACE/build/bin -type f -perm -0500 -exec chrpath --delete {} \;
# Cleanup
$MAKE clean
# Cleanup rpath in executables and shared libraries
#find $WORKSPACE/build/bin -type f -perm -0500 -exec chrpath --delete {} \;
-find $
WORKSPACE/build
/lib -name "*.so" -exec chrpath --delete {} \;
+find $
PREFIX
/lib -name "*.so" -exec chrpath --delete {} \;
# Remove libtool .la files
# Remove libtool .la files
-find $
WORKSPACE/build
/lib -name "*.la" -exec rm -f {} \;
+find $
PREFIX
/lib -name "*.la" -exec rm -f {} \;
# Cleanup temp directory of dist build
if [ "$build" = "dist" ]; then
# Cleanup temp directory of dist build
if [ "$build" = "dist" ]; then
- cd $
WORKSPACE
+ cd $
SRCDIR
rm -rf $BUILD_PATH
fi
rm -rf $BUILD_PATH
fi
This page took
0.023865 seconds
and
4
git commands to generate.