From nobody Thu Aug 04 13:21:40 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 4Lz8Wn4ngxz4Xpcc; Thu, 4 Aug 2022 13:21:41 +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 4Lz8Wn1FbRz4K26; Thu, 4 Aug 2022 13:21:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659619301; 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=1DjNg4a5WpTOh4s2RnkQO6SZWpKuNo+KPlmd65xpRq4=; b=B0zChesnDIFxdNRtZA9POZOb+yGlP4vCbu0kHX/C8QOKPinDyeJIx5xUiikCmTfKFKqIDY LJDkqNLqHc4/3y8ilL8Q3y3lwM+0tD6ywNxoC/a2RKHmA+BFD/uoL0O2hnb7ExwMv3ur/W tZZyus7+PrHtm6yocmQqiZiZ5KIoxL3H4AxW8sJI2laGuIXGD8sgc3m3TWWEUn5mjYMguf 0U8TjerOpTXyEXDxLLAZXA/622YD0GjTl0W5E6fr6ZeExZB2684JsvSKsC1xjea5OhE301 iv+ZZT2L+Iruwj42wZgvw/idlYx6GN/JoEFwwuMgEUYgkuNXuWgQSfMpBkhXqQ== 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 4Lz8Wn0KDhzGZl; Thu, 4 Aug 2022 13:21:41 +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 274DLerc012137; Thu, 4 Aug 2022 13:21:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 274DLe90012136; Thu, 4 Aug 2022 13:21:40 GMT (envelope-from git) Date: Thu, 4 Aug 2022 13:21:40 GMT Message-Id: <202208041321.274DLe90012136@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitri Goutnik Subject: git: 998a548dca0d - main - Mk/Uses/go.mk: Pass MAKE_ENV to `go mod tidy` and `go mod vendor` 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: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 998a548dca0d9a4655c9426e0306299f86a0b37a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659619301; 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=1DjNg4a5WpTOh4s2RnkQO6SZWpKuNo+KPlmd65xpRq4=; b=f6z3A8jHZAnhMhxJ2lAOPdloxp+KxX3HVgW7Tz8dLZpCWUH2MNkDorfJfU0Aja1hpXbTRx W5Fl/UxPO4XeEUwu6pfAMtdb3yoYD0IbLIPyzxopLS89ljJnILRb56iT99vVFAC1lfN1Fn 3bLGLKtakZbGNem9strKzJz8p1MKujZnEm41FT4JP0ndRfrJxR3ePUO3qyLpUpbjElPodf I80FpY/iDxi+I2H8lQzyPsdOPYGFWXe9hxzLOHHu/12U6JvDC9tt9CkycLhgBKCoqk48Ip Iae0mv2qyUckBwDnL5wCPUKFfOgWAb4oz7EpkQx2TRcaQhb8o5H2l0aJ+YFSFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659619301; a=rsa-sha256; cv=none; b=cbI+VYBctRpeirSfsFUsP0ftMz+MtWRFraa9WxORrps1+0n5Ls4fHqAEBztKYW/gMKAf2d GqiQ/kL7EGGqlnkqdrHyUVMbu7wsJ2vLNc7XEklE1M5gfJf1fdX8+l+S4DBKsQg3Y98eMg v2IiO8AnzC3ow+jCcimQc+PJMwfP4f7yX1Ywr/Q3RE6jjuZtojoJrVxl0pBhkvN7zGwgIR gELv5IGkOwRVYb91D1jR1HoCQYIxaBk6PFq9yP+U5gL868sDh3VdMJlS4MUZQMK8kATvsc UA0Atu0DT+VGILtEPQPSqDWA03iAQLQ+S7pCJqIFNJhtvH0hnXQyRKUwsDoGjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=998a548dca0d9a4655c9426e0306299f86a0b37a commit 998a548dca0d9a4655c9426e0306299f86a0b37a Author: Dmitri Goutnik AuthorDate: 2022-08-04 12:58:43 +0000 Commit: Dmitri Goutnik CommitDate: 2022-08-04 13:11:06 +0000 Mk/Uses/go.mk: Pass MAKE_ENV to `go mod tidy` and `go mod vendor` With go1.19, these subsommands need to know GOCACHE location, which is derived from XDG_CACHE_HOME. Missing XDG_CACHE_HOME breaks poudriere user build of Go ports. PR: 265613 Reported by: otis, ohauer --- Mk/Uses/go.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk index 91ac5740cf95..9ae32ca267bc 100644 --- a/Mk/Uses/go.mk +++ b/Mk/Uses/go.mk @@ -195,9 +195,9 @@ _USES_extract+= 800:go-post-extract # already in MODCACHE), vendor them so we can patch them if needed. go-post-extract: @${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies"; - @(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e) + @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e) @${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies"; - @(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e) + @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e) . else # Legacy (GOPATH) build mode, setup directory structure expected by Go for the main module. go-post-extract: