diff options
| author | jperkin <jperkin@pkgsrc.org> | 2012-06-08 12:15:29 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2012-06-08 12:15:29 +0000 |
| commit | beff7c99ea0982b1e7530e3e101147e11fd3abab (patch) | |
| tree | dd6fddbb1b2b7465ee340b7c1415f55af751118c /bootstrap | |
| parent | 1340bd27a99cdcfd440f5b18fe92a0f8ac01806f (diff) | |
| download | pkgsrc-beff7c99ea0982b1e7530e3e101147e11fd3abab.tar.gz | |
Remove /usr/xpg4/bin from $PATH on Solaris, it causes weird issues in the
bmake test suite, and is unnecessary. Instead, ensure we use the xpg4 id.
Tested on Solaris 9 and SmartOS. Fixes PR#45444.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index c46267ee9d3..40a05f25866 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.175 2012/05/15 16:42:43 christos Exp $ +# $NetBSD: bootstrap,v 1.176 2012/06/08 12:15:29 jperkin Exp $ # # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -665,9 +665,6 @@ QNX) machine_arch=`uname -p | sed -e 's/x86/i386/'` ;; SunOS) - if [ -d "/usr/xpg4/bin" ]; then - overpath="/usr/xpg4/bin:$overpath" - fi root_group=root need_bsd_install=yes if [ -x "/usr/gnu/bin/awk" ]; then @@ -682,8 +679,9 @@ SunOS) fi need_ksh=yes set_opsys=no - groupsprog="/usr/xpg4/bin/id -gn" - whoamiprog="/usr/xpg4/bin/id -un" + idprog="/usr/xpg4/bin/id" + groupsprog="${idprog} -gn" + whoamiprog="${idprog} -un" machine_arch=`uname -p | sed -e 's/i86pc/i386/'` check_compiler=yes ;; |