CVS commit: pkgsrc/devel/bmake

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jun 12 16:01:36 UTC 2020

Modified Files:
        pkgsrc/devel/bmake: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/devel/bmake/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/bmake/Makefile
diff -u pkgsrc/devel/bmake/Makefile:1.76 pkgsrc/devel/bmake/Makefile:1.77
--- pkgsrc/devel/bmake/Makefile:1.76    Tue Jun  2 10:07:33 2020
+++ pkgsrc/devel/bmake/Makefile Fri Jun 12 16:01:36 2020
@@ -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 @@ CONFIGURE_ARGS+=    --sysconfdir=${PKG_SYSC
 
 .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}