X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=userspace-rcu%2Fliburcu-master.sh;h=52fbba46d6a725450dab36a2d3afbeb017a3a89d;hb=6a8635644e1edcb80464263013f09b40e6cdf245;hp=3315d18cc1560ad8d80e72ea480e1a785d81a642;hpb=d829d8a38e511f520e45666b4ce83f04432d2c1f;p=lttng-ci.git

diff --git a/userspace-rcu/liburcu-master.sh b/userspace-rcu/liburcu-master.sh
index 3315d18..52fbba4 100755
--- a/userspace-rcu/liburcu-master.sh
+++ b/userspace-rcu/liburcu-master.sh
@@ -3,7 +3,6 @@ rm -rf $WORKSPACE/build
 mkdir -p $WORKSPACE/build
 
 PREFIX="$WORKSPACE/build"
-NPROC=$((`nproc` + 1))
 
 ./bootstrap
 
@@ -24,12 +23,56 @@ tls_fallback)
     ;;
 esac
 
-./configure --prefix=$PREFIX $CONF_OPTS
+# Build type
+# oot : out-of-tree build
+# dist: build via make dist
+# *   : normal tree build
+#
+# Make sure to move to the build_path and configure
+# before continuing
 
-make -j $NPROC
+BUILD_PATH=$WORKSPACE
+case "$build" in
+	oot)
+		echo "Out of tree build"
+		BUILD_PATH=$WORKSPACE/oot
+		mkdir -p $BUILD_PATH
+		cd $BUILD_PATH
+		$WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+		;;
+	dist)
+		echo "Distribution out of tree build"
+		BUILD_PATH=`mktemp -d`
+
+		# Initial configure and generate tarball
+		./configure
+		make dist
+
+		mkdir -p $BUILD_PATH
+		cp *.tar.* $BUILD_PATH/
+		cd $BUILD_PATH
+
+		# Ignore level 1 of tar
+		tar xvf *.tar.* --strip 1
+
+		$BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
+		;;
+	*)
+		BUILD_PATH=$WORKSPACE
+		echo "Standard tree build"
+		$WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+		;;
+esac
+
+make
 make install
 make clean
 
 # Cleanup rpath and libtool .la files
 find $WORKSPACE/build/lib -name "*.so" -exec chrpath --delete {} \;
 find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \;
+
+# Cleanup temp directory of dist build
+if [ $build = "dist" ]; then
+	rm -rf $BUILD_PATH
+fi