Page MenuHomeFreeBSD
Files F146077611

D34857.id.diff
No OneTemporary
Actions

D34857.id.diff
View Options

Index: Mk/Uses/go.mk
===================================================================
--- Mk/Uses/go.mk
+++ Mk/Uses/go.mk
@@ -3,7 +3,7 @@
#
# Feature: go
# Usage: USES=go
-# Valid ARGS: (none), modules, no_targets, run
+# Valid ARGS: (none), modules, no_targets, no_vendor_dir, run
#
# (none) Setup GOPATH and build in GOPATH mode.
# modules If the upstream uses Go modules, this can be set to build
@@ -12,6 +12,8 @@
# make/CMake build. This will setup build environment like
# GO_ENV, GO_BUILDFLAGS but will not create post-extract and
# do-{build,install,test} targets.
+# no_vendor_dir don't populate the vendor directory with "go mod vendor"
+# and don't build with -mod=vendor
# run Indicates that Go is needed at run time and adds it to
# RUN_DEPENDS.
#
@@ -63,8 +65,14 @@
.if !defined(_INCLUDE_USES_GO_MK)
_INCLUDE_USES_GO_MK= yes
-.if !empty(go_ARGS:Nmodules:Nno_targets:Nrun)
-IGNORE= USES=go has invalid arguments: ${go_ARGS:Nmodules:Nno_targets:Nrun}
+.if !empty(go_ARGS:Nmodules:Nno_targets:Nno_vendor_dir:Nrun)
+IGNORE= USES=go has invalid arguments: ${go_ARGS:Nmodules:Nno_targets:Nno_vendor_dir:Nrun}
+.endif
+
+.if !empty(go_ARGS:Mno_vendor_dir)
+. if empty(go_ARGS:Mmodules)
+IGNORE= no_vendor_dir requires go:modules
+. endif
.endif
# Settable variables
@@ -109,8 +117,10 @@
GOARM=${GOARM}
.if ${go_ARGS:Mmodules}
+. if empty(go_ARGS:Mno_vendor_dir)
GO_BUILDFLAGS+= -mod=vendor
GO_TESTFLAGS+= -mod=vendor
+. endif
GO_GOPATH= ${DISTDIR}/go/${PKGORIGIN:S,/,_,g}
GO_WRKSRC= ${WRKSRC}
GO_ENV+= GOPATH="${GO_GOPATH}" \
@@ -168,7 +178,7 @@
post-extract:
@${MKDIR} ${GO_WRKSRC:H}
@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
-. elif ${go_ARGS:Mmodules} && defined(GO_MODULE)
+. elif ${go_ARGS:Mmodules} && defined(GO_MODULE) && empty(go_ARGS:Mno_vendor_dir)
post-extract:
@(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=off ${GO_CMD} mod vendor)
. endif

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 28, 3:00 PM (4 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29047892
Default Alt Text
D34857.id.diff (1 KB)

Event Timeline