From nobody Tue Aug 02 21:28:10 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ly7Q233sfz4YKTv; Tue, 2 Aug 2022 21:28:10 +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 4Ly7Q22f4Hz3CYW; Tue, 2 Aug 2022 21:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659475690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s4AEV/iERi36bATk2AVpkTiMiL48hs2hXHBefV1V0S4=; b=cB+OgwE7eJbilYEBQaJe3GbuXktNKCshgYRikJYQW1dgiGf+DCSXPm+5uTsWBxpZWR2yA9 726UJJExDbKGXwbtpo+6mGqTDGrl4YMh9CFLTtTp4YcKeH3KJe6sDiP9L+WEYacUooG178 qgGt1q0jFMQ6aRoncOi87CN/Vkum95gdTBDv+vuKuW48ms0FQQhkxHTT+qsEDuijXaFeHU we9JC7JPZ4o9wd234f1IId1JOpcMRH0TlYIVbDq0MUp4U+C1qzXsKUrDVXenvEtx2cM17C U2+OOcJhQjL4H40jM/HyfDB6A+oKHbBaI/aN4SsFlDLy+Wz6JDvuBwtGoiRggA== 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 4Ly7Q21kt7zRV1; Tue, 2 Aug 2022 21:28:10 +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 272LSATX060151; Tue, 2 Aug 2022 21:28:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 272LSAGL060150; Tue, 2 Aug 2022 21:28:10 GMT (envelope-from git) Date: Tue, 2 Aug 2022 21:28:10 GMT Message-Id: <202208022128.272LSAGL060150@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 8ead0f7997c6 - main - lang/quilc: Fix error handling in shell code; Add comments List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ead0f7997c60ebfe4817c67a3e61485ca8a7f08 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659475690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s4AEV/iERi36bATk2AVpkTiMiL48hs2hXHBefV1V0S4=; b=LcbVtytsaoM0PpVmIc9xfpNpBBmpq96kA6KmVV1NIMLmmXLhzE1ezJS97C+SPUqgzp+yi+ 2JKzrOuh+/osDOV2NQXHiCdgGgoY+4TCAnD618kdniv0IJEBBMBtGiXQ2v/GESfMOfWHgc FMbWyHdv2lTRtXUNbRgE689TFq0n4PkY3a4Of+uifxxbF4qMlm1UB4fpzod94LPJNYP+JJ gPoKX2AEZIptzgIjVoEAMY3NlwWugMgHIGf7OGklGuDl0qipC+b9VowQygu4nhRvX+lSde qZ+hzM4zA4Rt90e/IoULdieOQd+RfWdMsrVNyRlUTzpCcsa4l1hrX0j6xyXAJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659475690; a=rsa-sha256; cv=none; b=D6ABkOhsT075HulSxJuWFmAoZ1s+vWh734G7Xjz4Uc5VpFdYq+3jD8yvGq4I5K56mFVASO /YnGMc05XCGU1Wt2j1TDOju+FpglR/vcewH4gwlq8LD0Bqks8s0JKOV0qmfwtIJsgqmvGM C/zYu7P2qMrgXb6zkKt8z0oN94huoJG6i+ai5QnG1SvgmQ1Hlnqf0TahEuv74XCv6QO/2W /g3S+CkhKp85W/0u6yWyK1c7gebu8N/3fc/ZP8ihAiDj3oY8bdKl1tt/u2Itc1msdPKADg Wv6lwFlnpKvx4FcVrJsnxQmc7RsQVz9O5id86cx9LCsTQORYVKz5uOzkBVAUrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ead0f7997c60ebfe4817c67a3e61485ca8a7f08 commit 8ead0f7997c60ebfe4817c67a3e61485ca8a7f08 Author: Yuri Victorovich AuthorDate: 2022-08-02 21:26:57 +0000 Commit: Yuri Victorovich CommitDate: 2022-08-02 21:28:06 +0000 lang/quilc: Fix error handling in shell code; Add comments --- lang/quilc/Makefile | 6 +++--- lang/quilc/Makefile.deps | 5 +++++ lang/quilc/files/build-log-to-makefile-deps | 16 +++++++++++++++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/lang/quilc/Makefile b/lang/quilc/Makefile index 99d24a4f8476..fccf7742b17a 100644 --- a/lang/quilc/Makefile +++ b/lang/quilc/Makefile @@ -41,9 +41,9 @@ MAINTAINER_MODE= no .if (${MAINTAINER_MODE} == "yes") do-build: - # build, download dependencies during build, and collect build log with URLs in it - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${TARGET_ALL} 2>&1 | tee -a ${WRKDIR}/build.log - # convert build.log to Makefile.deps + # build, download dependencies during build, and save build log with URLs in it + @set -e; set -o pipefail; cd ${WRKSRC} && (${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${TARGET_ALL} 2>&1 | tee -a ${WRKDIR}/build.log) + # compute Makefile.deps based on URLs in build.log @${FILESDIR}/build-log-to-makefile-deps ${WRKDIR}/build.log > Makefile.deps .else . include diff --git a/lang/quilc/Makefile.deps b/lang/quilc/Makefile.deps index 06996cb7e5cf..aff523868c9a 100644 --- a/lang/quilc/Makefile.deps +++ b/lang/quilc/Makefile.deps @@ -1,3 +1,8 @@ +## +## (!!!) This is an auto-generated file. +## (!!!) Please do not modify manually. +## (!!!) Instead please follow the instructions in Makefile on how to update the port. +## MASTER_SITES_DEPS= \ http://beta.quicklisp.org/archive/alexa/2018-08-31/:alexa_20180831_git_tgz \ http://beta.quicklisp.org/archive/alexandria/2022-07-07/:alexandria_20220707_git_tgz \ diff --git a/lang/quilc/files/build-log-to-makefile-deps b/lang/quilc/files/build-log-to-makefile-deps index dab08c647e37..74acf7e30642 100755 --- a/lang/quilc/files/build-log-to-makefile-deps +++ b/lang/quilc/files/build-log-to-makefile-deps @@ -1,9 +1,21 @@ #!/bin/sh +# parse args +BUILD_LOG=$1 + +# error handling set -e +set -o pipefail -BUILD_LOG=$1 +# write the header +echo "##" +echo "## (!!!) This is an auto-generated file." +echo "## (!!!) Please do not modify manually." +echo "## (!!!) Instead please follow the instructions in Makefile on how to update the port." +echo "##" +echo "" +# write MASTER_SITES_DEPS echo "MASTER_SITES_DEPS= \\" cat ${BUILD_LOG} | \ grep -a "^; Fetching #