jjb: Use updated system bison and popt on sol11

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index ba5e0b929fa92a631579a59e4fafbc107e607256..85f4a5d12376359bacd028035f94c7f8842ad8bb 100755 (executable)
--- 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 6b0298ae8ba9ad676eb8f8ad135a9d64f11f826f..23a674d71b27c67f6e86216cef2b424daf5c5242 100755 (executable)
--- 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 9639fecf40f04829cbf763963555786c09e96adf..2fee661d6da24e69dab04a1edbb8c7a73f3745ef 100755 (executable)
--- 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"