diff options
| author | jperkin <jperkin@pkgsrc.org> | 2021-12-07 12:06:16 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2021-12-07 12:06:16 +0000 |
| commit | da45faf9d7b5135015ce92ddc18dff30a6772220 (patch) | |
| tree | 212b9e6558d3b362dbcd38121f9a970f0d9766cb /devel/gmake/Makefile | |
| parent | 42493c722311eeaa137dcefa360ada6eb042a0d2 (diff) | |
| download | pkgsrc-da45faf9d7b5135015ce92ddc18dff30a6772220.tar.gz | |
gmake: Use the pkgsrc bootstrap shell if set.
Fixes issues seen on e.g. older Solaris with the legacy /bin/sh. Add our
bootstrap shells to the list of POSIX-compatible shells, required for correct
operation of .ONESHELL mode, fixing the test suite with mksh.
Bump PKGREVISION.
Diffstat (limited to 'devel/gmake/Makefile')
| -rw-r--r-- | devel/gmake/Makefile | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 16093c54e95..48e033ac88c 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.115 2021/05/24 19:49:57 wiz Exp $ +# $NetBSD: Makefile,v 1.116 2021/12/07 12:06:16 jperkin Exp $ DISTNAME= make-4.3 PKGNAME= g${DISTNAME} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=make/} @@ -31,6 +31,20 @@ CONFIGURE_ARGS+= ac_cv_func_getloadavg_setgid=no .include "../../mk/bsd.prefs.mk" +# +# Keep in sync with devel/bmake, the goal is to ensure we use the same shell +# that was selected by bootstrap. +# +.if ${TOOLS_PLATFORM.sh:M?*/bin/mksh} +DEPENDS+= mksh-[0-9]*:../../shells/mksh +CPPFLAGS+= -DPKGSRC_DEFAULT_SHELL="\"${PREFIX}/bin/mksh\"" +.elif ${TOOLS_PLATFORM.sh:M?*/bin/pdksh} +DEPENDS+= pdksh-[0-9]*:../../shells/pdksh +CPPFLAGS+= -DPKGSRC_DEFAULT_SHELL="\"${PREFIX}/bin/pdksh\"" +.elif ${OPSYS} == "SunOS" && exists(/usr/bin/bash) +CPPFLAGS+= -DPKGSRC_DEFAULT_SHELL="\"/usr/bin/bash\"" +.endif + # kernel bug, fixed in NetBSD 9.99.82 .if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-9].*) CONFIGURE_ARGS.NetBSD+= --disable-posix-spawn |