Solaris 11.4 removed /usr/bin/optisa, use /usr/bin/isainfo instead.

This commit is contained in:
Todd C. Miller
2021-03-10 07:29:52 -07:00
parent 0e2ba920ee
commit 42fbc185ab

View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright 2021 One Identity LLC. ALL RIGHTS RESERVED # Copyright 2021 One Identity LLC. ALL RIGHTS RESERVED
pp_revision="20210306" pp_revision="20210310"
# Copyright 2018 One Identity LLC. ALL RIGHTS RESERVED. # Copyright 2018 One Identity LLC. ALL RIGHTS RESERVED.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -2855,7 +2855,11 @@ pp_solaris_detect_os () {
} }
pp_solaris_detect_arch () { pp_solaris_detect_arch () {
pp_solaris_arch=`/usr/bin/optisa amd64 sparcv9 i386 sparc` if [ -x /usr/bin/isainfo ]; then
pp_solaris_arch=`/usr/bin/isainfo -n`
else
pp_solaris_arch=`/usr/bin/optisa amd64 sparcv9 i386 sparc`
fi
[ -z "$pp_solaris_arch" ] && [ -z "$pp_solaris_arch" ] &&
pp_error "can't determine processor architecture" pp_error "can't determine processor architecture"
case "$pp_solaris_arch" in case "$pp_solaris_arch" in