From: Todd C. Miller <Todd.Miller@sudo.ws>
Date: Fri, 17 Aug 2018 19:27:01 +0000 (-0600)
Subject: Detect number of CPUs on HP-UX.
X-Git-Tag: SUDO_1_8_24^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7e265939bf662532fec3008abec5050da65d3f3;p=sudo

Detect number of CPUs on HP-UX.
Use MAKE environment variable if set.
---

diff --git a/mkpkg b/mkpkg
index 4562a2d35..f8098c7f1 100755
--- a/mkpkg
+++ b/mkpkg
@@ -91,9 +91,10 @@ top_srcdir=`dirname $0`
 : ${osversion="`$top_srcdir/pp --probe`"}
 test -n "$osversion" || exit 1
 osrelease=`echo "$osversion" | sed -e 's/^[^0-9]*//' -e 's/-.*$//'`
+: ${MAKE=make}
 
 # If using GNU make, set number of jobs
-if make --version 2>&1 | grep GNU >/dev/null; then
+if ${MAKE} --version 2>&1 | grep GNU >/dev/null; then
     NJOBS=0
     case "`uname`" in
 	Darwin)
@@ -113,6 +114,9 @@ if make --version 2>&1 | grep GNU >/dev/null; then
 		NJOBS=`/usr/sbin/psrinfo | wc -l`
 	    fi
 	    ;;
+	HP-UX)
+	    NJOBS=`sar -Mu 1 1 | awk 'END {print NR-5}'`
+	    ;;
     esac
     if [ $NJOBS -gt 1 ]; then
 	make_opts="-j$NJOBS"
@@ -389,8 +393,8 @@ IFS="	$nl"
 set -- $configure_opts $extra_opts
 IFS="$OIFS"
 if [ -r Makefile ]; then
-    make $make_opts distclean
+    ${MAKE} $make_opts distclean
 fi
 $top_srcdir/configure "$@" || exit 1
-make $make_opts && make $make_opts PPFLAGS="$PPFLAGS" PPVARS="$PPVARS" package
+${MAKE} $make_opts && ${MAKE} $make_opts PPFLAGS="$PPFLAGS" PPVARS="$PPVARS" package
 test $debug -eq 0 && rm -rf destdir