[pkgsrc/trunk]: pkgsrc/devel/bmake bmake: Improve heuristic deciding whether ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8896a381aa02
branches:  trunk
changeset: 434199:8896a381aa02
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Jun 12 16:01:36 2020 +0000

description:
bmake: Improve heuristic deciding whether to use pdksh.

The ultimate goal here is to completely sync with what was used by the
bootstrap script, but for now this will at least ensure if pdksh was pulled
in by bootstrap then the final build of devel/bmake will also use the same
shell rather than randomly based on OPSYS.

diffstat:

 devel/bmake/Makefile |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r ac07a0ee80b0 -r 8896a381aa02 devel/bmake/Makefile
--- a/devel/bmake/Makefile      Fri Jun 12 15:22:17 2020 +0000
+++ b/devel/bmake/Makefile      Fri Jun 12 16:01:36 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2020/06/02 10:07:33 sjmulder Exp $
+# $NetBSD: Makefile,v 1.77 2020/06/12 16:01:36 jperkin Exp $
 
 DISTNAME=      bmake-20200524
 PKGREVISION=   1
@@ -34,16 +34,21 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+#
+# This section is incomplete, but the general idea is that we should use the
+# same shell that was selected by bootstrap.
+#
 .if ${OPSYS} == "SunOS" && exists(/usr/bin/bash)
 CONFIGURE_ARGS+=       --with-defshell=/usr/bin/bash
-.elif ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" || ${OPSYS} == "IRIX" || ${OPSYS} == "AIX"
+.elif ${TOOLS_PLATFORM.sh} == "${LOCALBASE}/bin/pdksh"
 DEPENDS+=              pdksh-[0-9]*:../../shells/pdksh
 CONFIGURE_ARGS+=       --with-defshell=${PREFIX}/bin/pdksh
 .endif
+
 MAKE_ENV.Interix+=     XDEFS=-DUSE_SELECT
 
 # Fix bmake not finding files (e.g. .include) on Illumos with 32 bit ABI
-CFLAGS.SunOS+=-D_FILE_OFFSET_BITS=64
+CFLAGS.SunOS+= -D_FILE_OFFSET_BITS=64
 
 do-extract:
        ${CP} -R ${FILESDIR} ${WRKSRC}