Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/bmake bmake: Support mksh as a bootstrap shell.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/183d2092e33f
branches:  trunk
changeset: 435330:183d2092e33f
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Jul 06 10:24:04 2020 +0000

description:
bmake: Support mksh as a bootstrap shell.

diffstat:

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

diffs (27 lines):

diff -r c2ef8000e0a6 -r 183d2092e33f devel/bmake/Makefile
--- a/devel/bmake/Makefile      Mon Jul 06 10:21:01 2020 +0000
+++ b/devel/bmake/Makefile      Mon Jul 06 10:24:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2020/06/18 10:07:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.79 2020/07/06 10:24:04 jperkin Exp $
 
 DISTNAME=      bmake-20200524
 PKGREVISION=   1
@@ -38,11 +38,14 @@
 # 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 ${TOOLS_PLATFORM.sh:M*/bin/pdksh}
+.if ${TOOLS_PLATFORM.sh:M?*/bin/mksh}
+DEPENDS+=              mksh-[0-9]*:../../shells/mksh
+CONFIGURE_ARGS+=       --with-defshell=${PREFIX}/bin/mksh
+.elif ${TOOLS_PLATFORM.sh:M?*/bin/pdksh}
 DEPENDS+=              pdksh-[0-9]*:../../shells/pdksh
 CONFIGURE_ARGS+=       --with-defshell=${PREFIX}/bin/pdksh
+.elif ${OPSYS} == "SunOS" && exists(/usr/bin/bash)
+CONFIGURE_ARGS+=       --with-defshell=/usr/bin/bash
 .endif
 
 MAKE_ENV.Interix+=     XDEFS=-DUSE_SELECT



Home | Main Index | Thread Index | Old Index