From cd808c9eeedb0026569edc203661c256b0acb822 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 14 Mar 2018 16:16:26 -0400
Subject: [PATCH] jjb: Use updated system bison and popt on sol11

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 scripts/babeltrace/build.sh  | 8 ++------
 scripts/liburcu/build.sh     | 2 --
 scripts/lttng-tools/build.sh | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index ba5e0b9..85f4a5d 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -103,13 +103,9 @@ 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 CPPFLAGS="-I/opt/csw/include"
-    export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib"
-    export LD_ALTEXEC=/usr/sfw/bin/gld
-    export LD=/usr/sfw/bin/gld
+    export LD_ALTEXEC=/usr/bin/gld
+    export LD=/usr/bin/gld
     ;;
 macosx)
     export MAKE=make
diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh
index 6b0298a..23a674d 100755
--- a/scripts/liburcu/build.sh
+++ b/scripts/liburcu/build.sh
@@ -103,8 +103,6 @@ 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
diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 9639fec..2fee661 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -120,7 +120,7 @@ sol11-i386)
     MAKE=gmake
     TAR=gtar
     NPROC=nproc
-    BISON="/opt/csw/bin/bison"
+    BISON="bison"
     YACC="$BISON -y"
     CFLAGS="${CFLAGS:-} -D_XOPEN_SOURCE=500"
     RUN_TESTS="no"
-- 
2.34.1