amigan/ports-local
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix uses

Browse source
This commit is contained in:
Dan Ponte 2022-07-24 11:01:42 -04:00
parent 6587fb2bbe
commit 5f386c32b7
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Mk/Uses/go.mk
View file

@ -63,8 +63,13 @@ _INCLUDE_USES_GO_MK= yes
GO_VALID_VERSIONS= 1.17 1.18 1.19-devel GO_VALID_VERSIONS= 1.17 1.18 1.19-devel
# Check arguments sanity # Check arguments sanity
. if !empty(go_ARGS:N[1-9].[0-9][0-9]:N*-devel:Nmodules:Nno_targets:Nrun) . if !empty(go_ARGS:N[1-9].[0-9][0-9]:N*-devel:Nmodules:Nno_targets:Nrun:Nnovendor)
IGNORE= USES=go has invalid arguments: ${go_ARGS:N[1-9].[0-9][0-9]:N*-devel:Nmodules:Nno_targets:Nrun} IGNORE= USES=go has invalid arguments: ${go_ARGS:N[1-9].[0-9][0-9]:N*-devel:Nmodules:Nno_targets:Nrun:Nnovendor}
. endif
.if !empty(go_ARGS:Mnovendor)
. if empty(go_ARGS:Mmodules)
IGNORE= novendor requires go:modules
. endif . endif
# Parse Go version # Parse Go version
@ -122,7 +127,7 @@ GO_ENV+= CGO_ENABLED=${CGO_ENABLED} \
GOARM=${GOARM} GOARM=${GOARM}
. if ${go_ARGS:Mmodules} . if ${go_ARGS:Mmodules}
. if !${go_ARGS:Mnovendor} . if empty(go_ARGS:Mnovendor)
GO_BUILDFLAGS+= -mod=vendor GO_BUILDFLAGS+= -mod=vendor
GO_TESTFLAGS+= -mod=vendor GO_TESTFLAGS+= -mod=vendor
. endif . endif
@ -197,7 +202,7 @@ _USES_extract+= 800:go-post-extract
go-post-extract: go-post-extract:
@${MKDIR} ${GO_WRKSRC:H} @${MKDIR} ${GO_WRKSRC:H}
@${LN} -sf ${WRKSRC} ${GO_WRKSRC} @${LN} -sf ${WRKSRC} ${GO_WRKSRC}
. elif ${go_ARGS:Mmodules} && defined(GO_MODULE) . elif ${go_ARGS:Mmodules} && defined(GO_MODULE) && empty(go_ARGS:Mnovendor)
# Module-aware build mode. Although not strictly necessary (all build dependencies should be # Module-aware build mode. Although not strictly necessary (all build dependencies should be
# already in MODCACHE), vendor them so we can patch them if needed. # already in MODCACHE), vendor them so we can patch them if needed.
go-post-extract: go-post-extract: