diff options
| author | hans <hans@pkgsrc.org> | 2013-01-31 22:55:21 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2013-01-31 22:55:21 +0000 |
| commit | 72615fe03c428079422b10ad576e70545c0a8e9a (patch) | |
| tree | ba1df9a810879f82767e9dede2eae890b23ab819 | |
| parent | 32a163e3441ce23b888bb1a44088ac3a5c99fb1d (diff) | |
| download | pkgsrc-72615fe03c428079422b10ad576e70545c0a8e9a.tar.gz | |
Use /usr/bin/bash on all SunOS 5.11 variants if it exists. Fall back to
shells/pdksh in all other cases, native /bin/ksh is not good enough.
| -rwxr-xr-x | bootstrap/bootstrap | 16 | ||||
| -rw-r--r-- | devel/bmake/Makefile | 6 |
2 files changed, 6 insertions, 16 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 08a6c558758..5072f8d1959 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.182 2013/01/06 17:33:24 cheusov Exp $ +# $NetBSD: bootstrap,v 1.183 2013/01/31 22:55:21 hans Exp $ # # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -681,17 +681,9 @@ SunOS) else need_sed=yes fi - if [ "`uname -r`" = "5.11" ]; then - case "`uname -v`" in - joyent_*) - bootstrap_sh=${SH:-/usr/bin/bash} - bootstrap_sh_set=set - ;; - *) - bootstrap_sh=${SH:-/bin/ksh} - bootstrap_sh_set=set - ;; - esac + if [ "`uname -r`" = "5.11" -a -x "/usr/bin/bash" ]; then + bootstrap_sh=${SH:-/usr/bin/bash} + bootstrap_sh_set=set else need_ksh=yes fi diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile index aff92627966..87abdf5164c 100644 --- a/devel/bmake/Makefile +++ b/devel/bmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2012/11/01 16:48:12 sjg Exp $ +# $NetBSD: Makefile,v 1.61 2013/01/31 22:55:22 hans Exp $ # DISTNAME= bmake-20110606 @@ -33,10 +33,8 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} .include "../../mk/bsd.prefs.mk" -.if ${OS_VARIANT} == "SmartOS" +.if !empty(MACHINE_PLATFORM:MSunOS-5.11-*) && exists(/usr/bin/bash) CONFIGURE_ARGS+= --with-defshell=/usr/bin/bash -.elif ${OPSYS} == "SunOS" && ${OS_VERSION} == "5.11" -CONFIGURE_ARGS+= --with-defshell=/bin/ksh .elif ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "IRIX" DEPENDS+= pdksh-[0-9]*:../../shells/pdksh CONFIGURE_ARGS+= --with-defshell=${PREFIX}/bin/pdksh |