git: 311e5367525a - 2021Q2 - shells/modernish: Fix build

Mateusz Piotrowski 0mp at FreeBSD.org
Tue May 4 07:35:32 UTC 2021


The branch 2021Q2 has been updated by 0mp:

URL: https://cgit.FreeBSD.org/ports/commit/?id=311e5367525a1c0cd978046afede8e67def532d1

commit 311e5367525a1c0cd978046afede8e67def532d1
Author:     Mateusz Piotrowski <0mp at FreeBSD.org>
AuthorDate: 2021-04-28 12:47:43 +0000
Commit:     Mateusz Piotrowski <0mp at FreeBSD.org>
CommitDate: 2021-05-04 07:35:20 +0000

    shells/modernish: Fix build
    
    It looks like modernish requires /dev/tty to be available during the
    installation as it tries to run its install-time test suite. A solution
    to that is wrapping ./install.sh with script(1) to make a TTY available.
    Interestingly, if we replace script(1) with daemon(8), we can reproduce
    the error present in the pkg fallout logs.
    
    (cherry picked from commit 0e66f4260178b5e9528cd6009d4c3c735bf46350)
---
 shells/modernish/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shells/modernish/Makefile b/shells/modernish/Makefile
index 4dc94d0f6e6f..4b0660359bb7 100644
--- a/shells/modernish/Makefile
+++ b/shells/modernish/Makefile
@@ -19,7 +19,8 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	cd ${WRKSRC} && \
-	${SETENV} ${MAKE_ENV} ./install.sh -d ${PREFIX} -D ${STAGEDIR} -n -s ${SH}
+	${SETENV} ${MAKE_ENV} script -q /dev/stdout \
+		${SH} -x ./install.sh -d ${PREFIX} -D ${STAGEDIR} -n -s ${SH}
 
 	${RM} ${STAGEDIR}${DOCSDIR}/LICENSE
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR:H}


More information about the dev-commits-ports-all mailing list