Date: Thu, 15 Apr 2021 11:25:37 GMT From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 43ebfaa30d8d - main - shells/modernish: Make the build more verbose Message-ID: <202104151125.13FBPbH7000232@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=43ebfaa30d8d8744bf0e345ab29cd133640740e4 commit 43ebfaa30d8d8744bf0e345ab29cd133640740e4 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-04-15 11:23:03 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-04-15 11:23:03 +0000 shells/modernish: Make the build more verbose Our official poudriere instances fail to build this port for unknown reasons. Let's get some additional logs in order to fix the issue. Reported by: pkg-fallout --- shells/modernish/Makefile | 2 +- shells/modernish/files/patch-install.sh | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/shells/modernish/Makefile b/shells/modernish/Makefile index c5e9666474ec..9c9a1e4958b7 100644 --- a/shells/modernish/Makefile +++ b/shells/modernish/Makefile @@ -18,7 +18,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES do-install: cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ./install.sh -d ${PREFIX} -D ${STAGEDIR} -n -s ${SH} + ${SETENV} ${MAKE_ENV} ${SH} -x ./install.sh -d ${PREFIX} -D ${STAGEDIR} -n -s ${SH} ${RM} ${STAGEDIR}${DOCSDIR}/LICENSE ${MKDIR} ${STAGEDIR}${EXAMPLESDIR:H} diff --git a/shells/modernish/files/patch-install.sh b/shells/modernish/files/patch-install.sh new file mode 100644 index 000000000000..9f59425be61e --- /dev/null +++ b/shells/modernish/files/patch-install.sh @@ -0,0 +1,11 @@ +--- install.sh.orig 2021-04-15 11:21:11 UTC ++++ install.sh +@@ -119,7 +119,7 @@ case ${opt_s+s} in + ( * ) MSH_SHELL=$opt_s + export MSH_SHELL + echo "Relaunching ${0##*/} with $MSH_SHELL..." >&2 +- exec "$MSH_SHELL" "$MSH_PREFIX/${0##*/}" --relaunch "$@" ;; ++ exec "$MSH_SHELL" -x "$MSH_PREFIX/${0##*/}" --relaunch "$@" ;; + esac ;; + esac +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104151125.13FBPbH7000232>