stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7010732: SA_ALTROOT only works if running the SA tools from their build directory

Browse Source 
Fixed SA packaging scripts

Reviewed-by: sla, kevinw
This commit is contained in:
Dmitry Samersoff 2014-01-28 14:45:39 +04:00
parent 30bac4bcc7
commit e6d68e6d66
3 changed files with 24 additions and 18 deletions
hotspot/agent/make
mkinstallsaenv.shsaenv64.sh

2
hotspot/agent/make/mkinstall

@ -27,7 +27,9 @@ jar -cvf $SA_NAME/sa.jar -C ../build/classes .
cp ../src/os/solaris/proc/amd64/libsaproc.so $SA_NAME/solaris/amd64
cp ../src/os/solaris/proc/sparc/libsaproc.so $SA_NAME/solaris/sparc
cp ../src/os/solaris/proc/sparc/libsaproc_audit.so $SA_NAME/solaris/sparc
cp ../src/os/solaris/proc/sparcv9/libsaproc.so $SA_NAME/solaris/sparcv9
cp ../src/os/solaris/proc/sparcv9/libsaproc_audit.so $SA_NAME/solaris/sparcv9
cp ../src/os/solaris/proc/i386/libsaproc.so $SA_NAME/solaris/i386
cp ../src/os/linux/i386/libsaproc.so $SA_NAME/linux/i386
cp ../src/os/linux/ia64/libsaproc.so $SA_NAME/linux/ia64

19
hotspot/agent/make/saenv.sh

@ -48,16 +48,17 @@ if [ "$OS" = "Linux" ]; then
CPU=i386
fi
else
# configure audit helper library if SA_ALTROOT is set
if [ -n "$SA_ALTROOT" ]; then
LD_AUDIT_32=$STARTDIR/../src/os/solaris/proc/`uname -p`/libsaproc_audit.so
export LD_AUDIT_32
if [ ! -f $LD_AUDIT_32 ]; then
echo "SA_ALTROOT is set and can't find libsaproc_audit.so."
echo "Make sure to build it with 'make natives'."
exit 1
fi
# configure audit helper library for solaris
LD_AUDIT_32=$STARTDIR/../src/os/solaris/proc/`uname -p`/libsaproc_audit.so
if [ ! -f $LD_AUDIT_32 ]; then
LD_AUDIT_32=$STARTDIR/solaris/`uname -p`/libsaproc_audit.so
fi
if [ ! -f $LD_AUDIT_32 ]; then
echo "Can't find libsaproc_audit.so."
echo "Make sure to build it with 'make natives'."
exit 1
fi
export LD_AUDIT_32
SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p`
OPTIONS="-Dsa.library.path=$SA_LIBPATH -Dsun.jvm.hotspot.debugger.useProcDebugger"
CPU=sparc

21
hotspot/agent/make/saenv64.sh

@ -43,16 +43,19 @@ else
fi
fi
# configure audit helper library if SA_ALTROOT is set
if [ -n "$SA_ALTROOT" ]; then
LD_AUDIT_64=$STARTDIR/../src/os/solaris/proc/$CPU/libsaproc_audit.so
export LD_AUDIT_64
if [ ! -f $LD_AUDIT_64 ]; then
echo "SA_ALTROOT is set and can't find libsaproc_audit.so."
echo "Make sure to build it with 'make natives'."
exit 1
fi
# configure audit helper library
LD_AUDIT_64=$STARTDIR/../src/os/solaris/proc/$CPU/libsaproc_audit.so
if [ ! -f $LD_AUDIT_64 ]; then
LD_AUDIT_64=$STARTDIR/solaris/$CPU/libsaproc_audit.so
fi
if [ ! -f $LD_AUDIT_64 ]; then
echo "Can't find libsaproc_audit.so."
echo "Make sure to build it with 'make natives'."
exit 1
fi
export LD_AUDIT_64
SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/$CPU:$STARTDIR/solaris/$CPU
OPTIONS="-Dsa.library.path=$SA_LIBPATH -Dsun.jvm.hotspot.debugger.useProcDebugger"