From ad11244c860426ba4e743cae9075319a2732cf25 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 28 Jun 2017 16:03:16 -0400 Subject: [PATCH] jjb: Update solaris jobs build script Signed-off-by: Michael Jeanson --- scripts/babeltrace/build.sh | 1 + scripts/liburcu/build.sh | 5 +++-- scripts/lttng-tools/build.sh | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index 18532cb..2310b36 100755 --- a/scripts/babeltrace/build.sh +++ b/scripts/babeltrace/build.sh @@ -40,6 +40,7 @@ solaris10) NPROC=gnproc BISON=bison YACC="$BISON -y" + export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH" ;; solaris11) MAKE=gmake diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh index b9e9e01..a3127d9 100755 --- a/scripts/liburcu/build.sh +++ b/scripts/liburcu/build.sh @@ -92,7 +92,8 @@ solaris10) TAR=gtar NPROC=gnproc LDFLAGS="" - CFLAGS="-D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1" + CFLAGS="" + export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH" ;; solaris11) @@ -100,7 +101,7 @@ solaris11) TAR=gtar NPROC=nproc LDFLAGS="" - CFLAGS="-D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1" + CFLAGS="" export PATH="$PATH:/usr/perl5/bin" ;; diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh index 48afecf..ca0d819 100755 --- a/scripts/lttng-tools/build.sh +++ b/scripts/lttng-tools/build.sh @@ -109,8 +109,10 @@ solaris10) NPROC=gnproc BISON="bison" YACC="$BISON -y" - CFLAGS="-D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1" + CFLAGS="-D_XOPEN_SOURCE=500" RUN_TESTS="no" + + export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH" ;; solaris11) @@ -119,7 +121,7 @@ solaris11) NPROC=nproc BISON="/opt/csw/bin/bison" YACC="$BISON -y" - CFLAGS="-D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1" + CFLAGS="-D_XOPEN_SOURCE=500" RUN_TESTS="no" export PATH="$PATH:/usr/perl5/bin" -- 2.34.1