diff options
| author | jperkin <jperkin> | 2012-06-15 09:54:41 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2012-06-15 09:54:41 +0000 |
| commit | 14668f8d9b50c4917f756a28eef8f9a3b3397ad2 (patch) | |
| tree | ed8323024f34d1c266c8a24e27342400af18bc75 | |
| parent | 656decae5dc57c4146152a63305847e9f095e56e (diff) | |
| download | pkgsrc-14668f8d9b50c4917f756a28eef8f9a3b3397ad2.tar.gz | |
Use native ksh93 on Solaris 11 and derivatives.
| -rwxr-xr-x | bootstrap/bootstrap | 9 | ||||
| -rw-r--r-- | devel/bmake/Makefile | 6 | ||||
| -rw-r--r-- | mk/tools/tools.SunOS.mk | 3 |
3 files changed, 13 insertions, 5 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 40a05f25866..dde7bb3daae 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.176 2012/06/08 12:15:29 jperkin Exp $ +# $NetBSD: bootstrap,v 1.177 2012/06/15 09:54:41 jperkin Exp $ # # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -677,7 +677,12 @@ SunOS) else need_sed=yes fi - need_ksh=yes + if [ "`uname -r`" = "5.11" ]; then + bootstrap_sh=${SH:-/bin/ksh} + bootstrap_sh_set=set + else + need_ksh=yes + fi set_opsys=no idprog="/usr/xpg4/bin/id" groupsprog="${idprog} -gn" diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile index eb16c29eca4..8c4ffbcfa4c 100644 --- a/devel/bmake/Makefile +++ b/devel/bmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2012/06/10 12:44:27 asau Exp $ +# $NetBSD: Makefile,v 1.57 2012/06/15 09:54:41 jperkin Exp $ # DISTNAME= bmake-20110606 @@ -34,7 +34,9 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" +.if ${OPSYS} == "SunOS" && ${OS_VERSION} == "5.11" +CONFIGURE_ARGS+= --with-defshell=/bin/ksh +.elif ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" DEPENDS+= pdksh-[0-9]*:../../shells/pdksh CONFIGURE_ARGS+= --with-defshell=${PREFIX}/bin/pdksh .endif diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk index 1ccc55e0423..2cd5facdc6a 100644 --- a/mk/tools/tools.SunOS.mk +++ b/mk/tools/tools.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.SunOS.mk,v 1.38 2012/05/21 15:19:13 jperkin Exp $ +# $NetBSD: tools.SunOS.mk,v 1.39 2012/06/15 09:54:41 jperkin Exp $ # # System-supplied tools for the Solaris operating system. # @@ -132,6 +132,7 @@ TOOLS_PLATFORM.install?= /usr/bin/ginstall .else TOOLS_PLATFORM.install?= /usr/ucb/install .endif +TOOLS_PLATFORM.ksh?= /bin/ksh TOOLS_PLATFORM.ln?= /usr/bin/ln TOOLS_PLATFORM.ls?= /usr/bin/ls TOOLS_PLATFORM.m4?= /usr/ccs/bin/m4 |