From owner-dev-commits-ports-all@freebsd.org Thu Apr 15 11:25:37 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E22585EB7D3; Thu, 15 Apr 2021 11:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FLcTY66sSz3lr1; Thu, 15 Apr 2021 11:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C4ACF10987; Thu, 15 Apr 2021 11:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13FBPbAp000233; Thu, 15 Apr 2021 11:25:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13FBPbH7000232; Thu, 15 Apr 2021 11:25:37 GMT (envelope-from git) Date: Thu, 15 Apr 2021 11:25:37 GMT Message-Id: <202104151125.13FBPbH7000232@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 43ebfaa30d8d - main - shells/modernish: Make the build more verbose MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43ebfaa30d8d8744bf0e345ab29cd133640740e4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Apr 2021 11:25:37 -0000 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 +