jjb: proper pkgconfig setup on Solaris

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

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index efc8be1b99edf55497637c770eb1ddcd60f5308c..b81adec457b88bdb54a4abf276838f07a810212e 100755 (executable)
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -169,13 +169,12 @@ sol11-i386)
     export MAKE=gmake
     export TAR=gtar
     export NPROC=nproc
-    export PATH="$PATH:/usr/perl5/bin"
-    export CPPFLAGS="-I/opt/csw/include"
-    export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib"
+    export PATH="/opt/csw/bin:$PATH:/usr/perl5/bin"
     export LD_ALTEXEC=/usr/bin/gld
     export LD=/usr/bin/gld
     export PYTHON="python3"
     export PYTHON_CONFIG="python3-config"
+    export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
     ;;
 
 macosx)
@@ -352,7 +351,7 @@ $MAKE -j "$($NPROC)" V=1
 
 # Force rebase DLL address mapping
 if [ "${rebase_dll:-}" == "1" ]; then
-       find . -name "*.dll" | xargs rebase -O -v
+       find . -name "*.dll" -print0 | xargs -0 rebase -O -v
 fi
 
 # Install in the workspace

diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh
index 7d2951e20fcd5318942e7b6bb5dc01c172ab10c2..76f8d3cc60389672146dd1a4c4d2c6a783d1b942 100755 (executable)
--- a/scripts/liburcu/build.sh
+++ b/scripts/liburcu/build.sh
@@ -169,11 +169,12 @@ sol11-i386)
     export MAKE=gmake
     export TAR=gtar
     export NPROC=nproc
-    export PATH="$PATH:/usr/perl5/bin"
+    export PATH="/opt/csw/bin:$PATH:/usr/perl5/bin"
     export LD_ALTEXEC=/usr/bin/gld
     export LD=/usr/bin/gld
     export PYTHON="python3"
     export PYTHON_CONFIG="python3-config"
+    export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
     ;;
 
 macosx)

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 7637bc0332f49f37d874342040acd7bcc38b3ca4..2ead92bae00382aaeaa06bb21811615b2ba5d172 100755 (executable)
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -193,7 +193,7 @@ sol10-i386)
     export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH"
     export CPPFLAGS="-I/opt/csw/include -D_XOPEN_SOURCE=500 $CPPFLAGS"
     export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib $LDFLAGS"
-    export PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig"
+    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/csw/lib/pkgconfig"
     export PYTHON="python3"
     export PYTHON_CONFIG="python3-config"
 
@@ -204,11 +204,11 @@ sol11-i386)
     export MAKE=gmake
     export TAR=gtar
     export NPROC=nproc
-    export PATH="$PATH:/usr/perl5/bin"
-    export CPPFLAGS="-I/opt/csw/include -D_XOPEN_SOURCE=500 $CPPFLAGS"
-    export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib $LDFLAGS"
+    export PATH="/opt/csw/bin:$PATH:/usr/perl5/bin"
+    export CPPFLAGS="-D_XOPEN_SOURCE=500 $CPPFLAGS"
     export PYTHON="python3"
     export PYTHON_CONFIG="python3-config"
+    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib/pkgconfig"
 
     RUN_TESTS="no"
     ;;