From c56b9301d265ad6a73b5d23ca06daf4fdcd4ba1f Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 11 Nov 2015 15:34:30 -0500 Subject: [PATCH] Add arm64 to babeltrace and normalize build script --- jobs/babeltrace.yaml | 2 +- scripts/babeltrace/build.sh | 95 +++++++++++++++++++++---------------- 2 files changed, 55 insertions(+), 42 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 1f56f9a..7239f39 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -215,7 +215,7 @@ conf: !!python/tuple [std, static, python-bindings] - 'babeltrace_{version}_{buildtype}': buildtype: portbuild - arch: !!python/tuple [armhf, powerpc, ppc64el] + arch: !!python/tuple [armhf, arm64, powerpc, ppc64el] build: !!python/tuple [std] conf: !!python/tuple [std, static, python-bindings] - 'babeltrace_{version}_{buildtype}': diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index 4aa0cb6..cc41653 100755 --- a/scripts/babeltrace/build.sh +++ b/scripts/babeltrace/build.sh @@ -1,4 +1,4 @@ -#!/bin/sh -exu +#!/bin/bash -exu # # Copyright (C) 2015 - Jonathan Rajotte-Julien # @@ -15,16 +15,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . + # Create build directory rm -rf $WORKSPACE/build mkdir -p $WORKSPACE/build PREFIX="$WORKSPACE/build" -./bootstrap - -CONF_OPTS="" - +# Set platform variables case "$arch" in solaris10) MAKE=gmake @@ -50,6 +48,8 @@ solaris11) ;; esac +# Set configure options for each build configuration +CONF_OPTS="" case "$conf" in static) echo "Static build" @@ -68,6 +68,11 @@ python-bindings) ;; esac + +# Run bootstrap prior to configure +./bootstrap + + # Build type # oot : out-of-tree build # dist: build via make dist @@ -75,55 +80,63 @@ esac # # Make sure to move to the build_path and configure # before continuing - BUILD_PATH=$WORKSPACE TEST_PLAN_PATH=$WORKSPACE - case "$build" in - oot) - echo "Out of tree build" - BUILD_PATH=$WORKSPACE/oot - mkdir -p $BUILD_PATH - cd $BUILD_PATH - MAKE=$MAKE BISON="$BISON" YACC="$YACC" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS - ;; - dist) - echo "Distribution out of tree build" - BUILD_PATH=`mktemp -d` - - # Initial configure and generate tarball - MAKE=$MAKE BISON="$BISON" YACC="$YACC" ./configure - $MAKE dist - - mkdir -p $BUILD_PATH - cp *.tar.* $BUILD_PATH/ - cd $BUILD_PATH - - # Ignore level 1 of tar - $TAR xvf *.tar.* --strip 1 - - MAKE=$MAKE BISON="$BISON" YACC="$YACC" $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS - - # Set test plan to dist tar - TEST_PLAN_PATH=$BUILD_PATH - ;; - *) - echo "Standard tree build" - MAKE=$MAKE BISON="$BISON" YACC="$YACC" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS - ;; + oot) + echo "Out of tree build" + BUILD_PATH=$WORKSPACE/oot + mkdir -p $BUILD_PATH + cd $BUILD_PATH + MAKE=$MAKE BISON="$BISON" YACC="$YACC" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS + ;; + + dist) + echo "Distribution out of tree build" + BUILD_PATH=`mktemp -d` + + # Initial configure and generate tarball + MAKE=$MAKE BISON="$BISON" YACC="$YACC" ./configure + $MAKE dist + + mkdir -p $BUILD_PATH + cp *.tar.* $BUILD_PATH/ + cd $BUILD_PATH + + # Ignore level 1 of tar + $TAR xvf *.tar.* --strip 1 + + MAKE=$MAKE BISON="$BISON" YACC="$YACC" $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS + + # Set test plan to dist tar + TEST_PLAN_PATH=$BUILD_PATH + ;; + +*) + echo "Standard tree build" + MAKE=$MAKE BISON="$BISON" YACC="$YACC" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS + ;; esac +# BUILD! $MAKE -j `$NPROC` $MAKE install + +# Run tests $MAKE check + +# Cleanup $MAKE clean -# Cleanup rpath and libtool .la files -#find $WORKSPACE/build/bin -executable -type f -exec chrpath --delete {} \; +# 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 {} \; + +# Remove libtool .la files find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \; -if [ $build = "dist" ]; then +# Clean temp dir for dist build +if [ "$build" = "dist" ]; then cd $WORKSPACE rm -rf $BUILD_PATH fi -- 2.34.1