pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/shells Get ast-ksh building again on NetBSD, at least ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/875ed0196893
branches:  trunk
changeset: 427531:875ed0196893
user:      ad <ad%pkgsrc.org@localhost>
date:      Fri Apr 17 21:28:01 2020 +0000

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

diffstat:

 shells/ast-ksh/Makefile.common |  8 ++++++--
 shells/static-ast-ksh/Makefile |  4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 785c39bc52ba -r 875ed0196893 shells/ast-ksh/Makefile.common
--- a/shells/ast-ksh/Makefile.common    Fri Apr 17 21:07:00 2020 +0000
+++ b/shells/ast-ksh/Makefile.common    Fri Apr 17 21:28:01 2020 +0000
@@ -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 @@
 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 @@
 .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 -r 785c39bc52ba -r 875ed0196893 shells/static-ast-ksh/Makefile
--- a/shells/static-ast-ksh/Makefile    Fri Apr 17 21:07:00 2020 +0000
+++ b/shells/static-ast-ksh/Makefile    Fri Apr 17 21:28:01 2020 +0000
@@ -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 @@
 # 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"



Home | Main Index | Thread Index | Old Index