From 995ac8f2eeb1bf3dd07e94bf91dcbbafb2b03b58 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 1 Aug 2017 15:32:46 -0400 Subject: [PATCH] jjb: rename Solaris arch to i386 Signed-off-by: Michael Jeanson --- jobs/liburcu.yaml | 2 +- jobs/lttng-tools.yaml | 10 +++--- scripts/liburcu/build.sh | 63 ++++++++++++++++++------------------ scripts/lttng-tools/build.sh | 4 +-- 4 files changed, 40 insertions(+), 39 deletions(-) diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml index 05508ff..467fbba 100644 --- a/jobs/liburcu.yaml +++ b/jobs/liburcu.yaml @@ -286,7 +286,7 @@ conf: !!python/tuple [std] - 'liburcu_{version}_{buildtype}': buildtype: solarisbuild - arch: !!python/tuple [solaris10, solaris11] + arch: !!python/tuple [sol10-i386, sol11-i386] build: !!python/tuple [std] conf: !!python/tuple [std, static, tls_fallback, debug-rcu] version: # Solaris support was introduced in 0.9 diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml index ba4c601..cd51a2c 100644 --- a/jobs/lttng-tools.yaml +++ b/jobs/lttng-tools.yaml @@ -535,7 +535,7 @@ buildtype: solarisbuild version: master ustversion: master - arch: !!python/tuple [solaris10, solaris11] + arch: !!python/tuple [sol10-i386, sol11-i386] build: !!python/tuple [std] conf: !!python/tuple [relayd-only] urcuversion: !!python/tuple [master] @@ -581,7 +581,7 @@ buildtype: solarisbuild version: stable-2.10 ustversion: stable-2.10 - arch: !!python/tuple [solaris10, solaris11] + arch: !!python/tuple [sol10-i386, sol11-i386] build: !!python/tuple [std] conf: !!python/tuple [relayd-only] urcuversion: !!python/tuple [stable-0.9] @@ -636,7 +636,7 @@ buildtype: solarisbuild version: stable-2.9 ustversion: stable-2.9 - arch: !!python/tuple [solaris10, solaris11] + arch: !!python/tuple [sol10-i386, sol11-i386] build: !!python/tuple [std] conf: !!python/tuple [relayd-only] urcuversion: !!python/tuple [stable-0.9] @@ -691,7 +691,7 @@ buildtype: solarisbuild version: stable-2.8 ustversion: stable-2.8 - arch: !!python/tuple [solaris10, solaris11] + arch: !!python/tuple [sol10-i386, sol11-i386] build: !!python/tuple [std] conf: !!python/tuple [relayd-only] urcuversion: !!python/tuple [stable-0.9] @@ -863,7 +863,7 @@ buildtype: solarisbuild version: master-staging ustversion: master - arch: !!python/tuple [solaris10, solaris11] + arch: !!python/tuple [sol10-i386, sol11-i386] build: !!python/tuple [std] conf: !!python/tuple [relayd-only] urcuversion: !!python/tuple [master] diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh index a3127d9..76c0c61 100755 --- a/scripts/liburcu/build.sh +++ b/scripts/liburcu/build.sh @@ -87,41 +87,42 @@ export TMPDIR # Set platform variables case "$arch" in -solaris10) - MAKE=gmake - TAR=gtar - NPROC=gnproc - LDFLAGS="" - CFLAGS="" +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="" +sol11-i386) + export MAKE=gmake + export TAR=gtar + export NPROC=nproc + export BISON="/opt/csw/bin/bison" + export YACC="$BISON -y" 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="-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 @@ -153,7 +154,7 @@ 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 ;; @@ -177,7 +178,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) @@ -185,7 +186,7 @@ dist) BUILD_PATH=$(mktemp -d) # Initial configure and generate tarball - MAKE=$MAKE "$SRCDIR/configure" + "$SRCDIR/configure" $MAKE dist mkdir -p "$BUILD_PATH" @@ -195,11 +196,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 diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index ca0d819..de11e5c 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -103,7 +103,7 @@ BABEL_BINS="$WORKSPACE/deps/babeltrace/build/bin/" # Set platform variables case "$arch" in -solaris10) +sol10-i386) MAKE=gmake TAR=gtar NPROC=gnproc @@ -115,7 +115,7 @@ solaris10) export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH" ;; -solaris11) +sol11-i386) MAKE=gmake TAR=gtar NPROC=nproc -- 2.34.1