git: 73ce9db43191 - main - Uses/go.mk: Support proxy servers
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 01 Mar 2024 14:46:44 UTC
The branch main has been updated by tijl:
URL: https://cgit.FreeBSD.org/ports/commit/?id=73ce9db43191db2b2f34eaa9a03e12f80c292d72
commit 73ce9db43191db2b2f34eaa9a03e12f80c292d72
Author: Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2024-03-01 13:12:09 +0000
Commit: Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2024-03-01 14:45:31 +0000
Uses/go.mk: Support proxy servers
Pass on Go proxy server environment variables during make fetch.
Reported by: Кирилл Варнаков <kirill@varnakov.com>
Fixes: 572f23616926 Mk/*: Build with a clean environment
---
Mk/Uses/go.mk | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
index 32884f3f3607..1836f8972357 100644
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -192,7 +192,14 @@ go-post-fetch:
@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
@(cd ${DISTDIR}/${DIST_SUBDIR}; \
[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
- ${SETENVI} ${WRK_ENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
+ ${SETENVI} ${WRK_ENV} \
+ ${HTTP_PROXY:DHTTP_PROXY=${HTTP_PROXY:Q}} \
+ ${http_proxy:Dhttp_proxy=${http_proxy:Q}} \
+ ${HTTPS_PROXY:DHTTPS_PROXY=${HTTPS_PROXY:Q}} \
+ ${https_proxy:Dhttps_proxy=${https_proxy:Q}} \
+ ${NO_PROXY:DNO_PROXY=${NO_PROXY:Q}} \
+ ${no_proxy:Dno_proxy=${no_proxy:Q}} \
+ ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
. endif
_USES_extract+= 800:go-post-extract