Get ast-ksh building again on NetBSD, at least on amd64.

NetBSD · Apr 17, 2020 · d4aa560 · d4aa560
1 parent 04ae075
commit d4aa560
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/shells/ast-ksh/Makefile.common b/shells/ast-ksh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2017/02/19 20:18:16 maya Exp $
+# $NetBSD: Makefile.common,v 1.36 2020/04/17 21:28:01 ad Exp $
 #
 # used by shells/ast-ksh/Makefile
 # used by shells/static-ast-ksh/Makefile
@@ -16,6 +16,8 @@ HOMEPAGE=	http://www.kornshell.com/
 COMMENT=	Official AT&T release of KornShell 93
 LICENSE=	epl-v1.0
 
+USE_TOOLS=	bash
+
 NOT_FOR_PLATFORM=	Interix-*-* # taking nearly a day to build and crash!
 
 CONFLICTS=	static-ast-ksh-[0-9]*
@@ -29,7 +31,9 @@ MAKE_FLAGS+=	CC=${CC:Q} CCFLAGS=${CFLAGS:M*:Q}
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
-PDKSH=		/bin/ksh
+PDKSH=			${TOOLS_PATH.bash}
+KSH93_MAKEFLAGS+=	"SHELL=${PDKSH}"
+KSH93_MAKEFLAGS+=	"CCFLAGS=-D_NETBSD_SOURCE"
 .endif
 
 # Link with libm to fix sfcvt link error -

diff --git a/shells/static-ast-ksh/Makefile b/shells/static-ast-ksh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/11/04 21:14:07 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2020/04/17 21:28:01 ad Exp $
 #
 
 .include "../../shells/ast-ksh/Makefile.common"
@@ -17,6 +17,6 @@ COMMENT:=	Statically-linked version of the ${COMMENT}
 # SunOS 5.10 stopped shipping static libraries
 NOT_FOR_PLATFORM+=	SunOS-5.1[0-9]-*
 
-KSH93_MAKEFLAGS=	LDFLAGS=-static
+KSH93_MAKEFLAGS+=	LDFLAGS=-static
 
 .include "../../mk/bsd.pkg.mk"