pkgsrc-WIP-changes archive

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

ksh93u+: prevent hanging iffe tests on Solaris 11. This probably applies on Ubuntu, Debian, NetBSD-8 and other systems whose standard intepreter doesn't get along well with the scripts included in the AST iffe tests suite.



Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Wed Jun 29 14:08:23 2022 +0200
Changeset:	aad92901f57f2d1fb6445d1c84d5c87cc4ee4923

Modified Files:
	ksh93u+/Makefile

Log Message:
ksh93u+: prevent hanging iffe tests on Solaris 11.
This probably applies on Ubuntu, Debian, NetBSD-8 and other systems
whose standard intepreter doesn't get along well with the scripts
included in the AST iffe tests suite.

See issue #132 on ksh93/ksh repo:
Intermittent coprocess hang on Debian/Ubuntu and Solaris [1].

[1] https://github.com/ksh93/ksh/issues/132

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aad92901f57f2d1fb6445d1c84d5c87cc4ee4923

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

diffstat:
 ksh93u+/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diffs:
diff --git a/ksh93u+/Makefile b/ksh93u+/Makefile
index 70fe1bc051..79f0373ac3 100644
--- a/ksh93u+/Makefile
+++ b/ksh93u+/Makefile
@@ -18,7 +18,10 @@ CONFLICTS+=		ast-ksh-[0-9]* static-ast-ksh-[0-9]*
 USE_LANGUAGES=		c
 FORTIFY_SUPPORTED=	no
 
-MAKEFLAGS+=		CC=${CC:Q} CCFLAGS=${CFLAGS:M*:Q}
+KSH=	${TOOLS_PATH.ksh:Q}
+
+MAKEFLAGS+=		CC=${CC:Q} SHELL=${KSH}
+MAKEFLAGS+=		CCFLAGS=${CFLAGS:M*:Q}
 
 CFLAGS.SunOS+=	-std=c11 -D__EXTENSIONS__
 
@@ -30,7 +33,7 @@ WRKSRC=	${WRKDIR}/ksh-${DISTNAME:S,^v,,}
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} 				\
-		${SH} ./bin/package make ${MAKEFLAGS}
+		${KSH} ./bin/package make ${MAKEFLAGS}
 
 do-install:
 	set -e;								\
@@ -42,7 +45,7 @@ do-install:
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ksh93.1
 
 do-test:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}				\
-		${SH} ./bin/package test
+	cd ${WRKSRC} && ${SETENV} SHELL=${KSH}				\
+		${KSH} ./bin/package test
 
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index