CVS commit: pkgsrc/devel/ninja-build

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jul  6 10:48:34 UTC 2020

Modified Files:
        pkgsrc/devel/ninja-build: Makefile

Log Message:
ninja-build: Support mksh-enabled macOS installs.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/ninja-build/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/ninja-build/Makefile
diff -u pkgsrc/devel/ninja-build/Makefile:1.13 pkgsrc/devel/ninja-build/Makefile:1.14
--- pkgsrc/devel/ninja-build/Makefile:1.13      Tue Apr 21 07:48:55 2020
+++ pkgsrc/devel/ninja-build/Makefile   Mon Jul  6 10:48:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/04/21 07:48:55 dsainty Exp $
+# $NetBSD: Makefile,v 1.14 2020/07/06 10:48:34 jperkin Exp $
 
 DISTNAME=      ninja-1.10.0
 PKGNAME=       ${DISTNAME:S/ninja/ninja-build/}
@@ -26,8 +26,17 @@ BUILD_DEPENDS+=      re2c>=0.11.3:../../devel
 # Because many (most?) users of ninja/meson seem to need hacks involving
 # LD_LIBRARY_PATH, use a non-SIP-triggering shell under MacOS X.
 #
+# macOS bootstraps are transitioning to mksh as the system shell, once that
+# has been in place for a while we can remove the pdksh support, and ideally
+# just replace this whole section with -DNINJA_SHELL=${TOOLS_PLATFORM.sh}
+#
+.  if ${TOOLS_PLATFORM.sh:M?*/bin/mksh}
+DEPENDS+=      mksh-[0-9]*:../../shells/mksh
+CFLAGS+=       -DNINJA_SHELL=${PREFIX}/bin/mksh
+.  else
 DEPENDS+=      pdksh-[0-9]*:../../shells/pdksh
 CFLAGS+=       -DNINJA_SHELL=${PREFIX}/bin/pdksh
+.  endif
 .else
 CFLAGS+=       -DNINJA_SHELL=/bin/sh
 .endif