X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fliburcu%2Fbuild.sh;h=23a674d71b27c67f6e86216cef2b424daf5c5242;hb=6b35e57c434006884c10febcd85f8e77b66ae13d;hp=20187c4b016956c19774a0ca767c60ad9a3bde56;hpb=cd9733d5f5f06aa52e82e8a266d450d78959c13a;p=lttng-ci.git

diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh
index 20187c4..23a674d 100755
--- a/scripts/liburcu/build.sh
+++ b/scripts/liburcu/build.sh
@@ -84,43 +84,44 @@ rm -rf "$PREFIX" "$TMPDIR"
 mkdir -p "$PREFIX" "$TMPDIR"
 
 export TMPDIR
+export CFLAGS="-g -O2"
 
 # Set platform variables
 case "$arch" in
-solaris10)
-    MAKE=gmake
-    TAR=gtar
-    NPROC=gnproc
-    LDFLAGS=""
-    CFLAGS="-D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1"
+sol10-i386)
+    export MAKE=gmake
+    export TAR=gtar
+    export NPROC=gnproc
+    export BISON=bison
+    export YACC="$BISON -y"
+    export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH"
+    export CPPFLAGS="-I/opt/csw/include"
+    export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib"
+    export PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig"
     ;;
-
-solaris11)
-    MAKE=gmake
-    TAR=gtar
-    NPROC=nproc
-    LDFLAGS=""
-    CFLAGS="-D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1"
+sol11-i386)
+    export MAKE=gmake
+    export TAR=gtar
+    export NPROC=nproc
     export PATH="$PATH:/usr/perl5/bin"
+    #export LD_ALTEXEC=/usr/sfw/bin/gld
+    #export LD=/usr/sfw/bin/gld
     ;;
-
 macosx)
-    MAKE=make
-    TAR=tar
-    NPROC="getconf _NPROCESSORS_ONLN"
-    BISON="bison"
-    YACC="$BISON -y"
-    LDFLAGS="-L/opt/local/lib"
-    CFLAGS="-I/opt/local/include"
+    export MAKE=make
+    export TAR=tar
+    export NPROC="getconf _NPROCESSORS_ONLN"
+    export BISON="bison"
+    export YACC="$BISON -y"
+    export LDFLAGS="-L/opt/local/lib"
+    export CFLAGS="$CFLAGS -I/opt/local/include"
     export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
     ;;
 
 *)
-    MAKE=make
-    TAR=tar
-    NPROC=nproc
-    LDFLAGS=""
-    CFLAGS=""
+    export MAKE=make
+    export TAR=tar
+    export NPROC=nproc
     ;;
 esac
 
@@ -149,10 +150,10 @@ tls_fallback)
 
 debug-rcu)
     echo "Enable RCU sanity checks for debugging"
-    if vergt "$PACKAGE_VERSION" "0.9"; then
-       CONF_OPTS="--enable-debug-rcu"
+    if vergte "$PACKAGE_VERSION" "0.10"; then
+       CONF_OPTS="--enable-rcu-debug"
     else
-       CFLAGS="$CFLAGS -DDEBUG_RCU"
+       export CFLAGS="$CFLAGS -DDEBUG_RCU"
     fi
     ;;
 
@@ -176,7 +177,7 @@ oot)
     BUILD_PATH=$WORKSPACE/oot
     mkdir -p "$BUILD_PATH"
     cd "$BUILD_PATH"
-    MAKE=$MAKE CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
+    "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 
 dist)
@@ -184,7 +185,7 @@ dist)
     BUILD_PATH=$(mktemp -d)
 
     # Initial configure and generate tarball
-    MAKE=$MAKE "$SRCDIR/configure"
+    "$SRCDIR/configure"
     $MAKE dist
 
     mkdir -p "$BUILD_PATH"
@@ -194,11 +195,11 @@ dist)
     # Ignore level 1 of tar
     $TAR xvf ./*.tar.* --strip 1
 
-    MAKE=$MAKE CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+    "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 *)
     echo "Standard in-tree build"
-    MAKE=$MAKE CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+    "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 esac
 
@@ -207,7 +208,7 @@ $MAKE -j "$($NPROC)" V=1
 $MAKE install
 
 # Run tests
-$MAKE check
+$MAKE --keep-going check
 # Only run regtest for 0.9 and up
 if vergte "$PACKAGE_VERSION" "0.9"; then
    $MAKE regtest