Page MenuHomeFreeBSD
Files F148118959

D28184.id82346.diff
No OneTemporary
Actions

D28184.id82346.diff
View Options

Index: Mk/Uses/go.mk
===================================================================
--- Mk/Uses/go.mk
+++ Mk/Uses/go.mk
@@ -93,6 +93,9 @@
GOARM?= ${ARCH:C/armv//}
.endif
+GO_GOPROXY?= https://proxy.golang.org
+GO_GOSUMDB?= sum.golang.org
+
# Read-only variables
GO_CMD= ${LOCALBASE}/bin/go
@@ -103,14 +106,32 @@
GOARM=${GOARM}
.if ${go_ARGS:Mmodules}
-GO_BUILDFLAGS+= -mod=vendor
-GO_TESTFLAGS+= -mod=vendor
GO_WRKSRC= ${WRKSRC}
GO_ENV+= GOPATH="" \
GOBIN="${GO_WRKDIR_BIN}" \
GO111MODULE=on \
- GOPROXY=off \
- GO_NO_VENDOR_CHECKS=1
+ GOMODCACHE=${DISTDIR}/go/modcache \
+ GOFLAGS=-modcacherw \
+ GOSUMDB=${GO_GOSUMDB}
+. if defined(GO_MODULE)
+GO_BUILDFLAGS+= -mod=readonly
+GO_TESTFLAGS+= -mod=readonly
+GO_MODNAME= ${GO_MODULE:C/^([^@]*)(@([^@]*)?)/\1/}
+GO_MODVERSION= ${GO_MODULE:C/^([^@]*)(@([^@]*)?)/\2/:M@*:S/^@//:S/^$/${DISTVERSIONFULL}/}
+GO_MODFILE= ${GO_MODVERSION}.mod
+GO_DISTFILE= ${GO_MODVERSION}.zip
+DIST_SUBDIR= go/${DISTNAME}
+MASTER_SITES= ${GO_GOPROXY}/${GO_MODNAME}/@v/
+DISTFILES= ${GO_MODFILE} ${GO_DISTFILE}
+EXTRACT_ONLY= ${GO_DISTFILE}
+WRKSRC= ${WRKDIR}/${GO_MODNAME}@${GO_MODVERSION}
+USES+= zip
+. else
+GO_BUILDFLAGS+= -mod=vendor
+GO_TESTFLAGS+= -mod=vendor
+GO_ENV+= GO_NO_VENDOR_CHECKS=1 \
+ GOPROXY=off
+. endif
.else
GO_WRKSRC= ${WRKDIR}/src/${GO_PKGNAME}
GO_ENV+= GOPATH="${WRKDIR}" \
@@ -121,6 +142,7 @@
GO_PORT?= lang/go
BUILD_DEPENDS+= ${GO_CMD}:${GO_PORT}
+FETCH_DEPENDS+= ${GO_CMD}:${GO_PORT}
.if ${go_ARGS:Mrun}
RUN_DEPENDS+= ${GO_CMD}:${GO_PORT}
.endif
@@ -131,6 +153,14 @@
.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GO_POST_MK)
_INCLUDE_USES_GO_POST_MK= yes
+.if !target(post-fetch) && ${go_ARGS:Mmodules} && defined(GO_MODULE)
+post-fetch:
+ @${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
+ @(cd ${DISTDIR}/${DIST_SUBDIR}; \
+ ${RLN} ${GO_MODFILE} go.mod; \
+ ${SETENV} ${GO_ENV} ${GO_CMD} mod download -x)
+.endif
+
.if !target(post-extract) && empty(go_ARGS)
post-extract:
@${MKDIR} ${GO_WRKSRC:H}
@@ -189,14 +219,18 @@
fi
gomod-vendor: gomod-vendor-deps patch
- @cd ${WRKSRC}; ${SETENV} GOPATH=${WRKDIR}/.gopath GOFLAGS=-modcacherw ${GO_CMD} mod vendor; \
+ @cd ${WRKSRC}; ${SETENV} ${GO_ENV:NGOPROXY*} ${GO_CMD} mod vendor; \
[ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt
gomod-vendor-diff: gomod-vendor-deps patch
- @cd ${WRKSRC}; ${SETENV} GOPATH=${WRKDIR}/.gopath GOFLAGS=-modcacherw ${GO_CMD} mod vendor; \
+ @cd ${WRKSRC}; ${SETENV} ${GO_ENV:NGOPROXY*} ${GO_CMD} mod vendor; \
[ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt | ${SED} 's|GH_TUPLE=| |; s| \\$$||' | ${GREP} -v ' \\' > ${WRKDIR}/GH_TUPLE-new.txt && \
echo ${GH_TUPLE} | ${TR} -s " " "\n" | ${SED} "s|^| |" > ${WRKDIR}/GH_TUPLE-old.txt && \
${DIFF} ${WRKDIR}/GH_TUPLE-old.txt ${WRKDIR}/GH_TUPLE-new.txt || exit 0
+
+gomod-clean:
+ @${ECHO_MSG} "===> Cleaning Go modules cache"
+ @${SETENV} ${GO_ENV} ${GO_CMD} clean -modcache
.endif
.endif # defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GO_POST_MK)

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 16, 10:20 PM (17 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29790594
Default Alt Text
D28184.id82346.diff (3 KB)

Event Timeline