pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
go-package.mk: correct syntax.
Module Name: pkgsrc-wip
Committed By: Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By: bsiegert
Date: Sun May 19 22:12:05 2019 -0400
Changeset: 9ed0ccf54a7bb2ddef397aaf7f29712b164bb970
Modified Files:
go/go-package.mk
Log Message:
go-package.mk: correct syntax.
Otherwise, the GO_MODULE bits have no effect at all.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9ed0ccf54a7bb2ddef397aaf7f29712b164bb970
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
go/go-package.mk | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diffs:
diff --git a/go/go-package.mk b/go/go-package.mk
index 31f9ba8206..77bfe3c4d5 100644
--- a/go/go-package.mk
+++ b/go/go-package.mk
@@ -56,8 +56,8 @@
_GO_DIST_BASE!= basename ${GO_SRCPATH}
GO_DIST_BASE?= ${_GO_DIST_BASE}
-.if !empty(${GO_MODULE:M[Yy][Ee][Ss]})
-GO_BUILD_PATTERN?= all
+.if !empty(GO_MODULE:M[Yy][Ee][Ss])
+GO_BUILD_PATTERN?= ...
.else
GO_BUILD_PATTERN?= ${GO_SRCPATH}/...
WRKSRC= ${WRKDIR}/src/${GO_SRCPATH}
@@ -74,14 +74,14 @@ GOTOOLDIR= go${GOVERSSUFFIX}/pkg/tool/${GO_PLATFORM}
PRINT_PLIST_AWK+= /^@pkgdir bin$$/ { next; }
PRINT_PLIST_AWK+= /^@pkgdir gopkg$$/ { next; }
-.if !empty(${GO_MODULE:M[Yy][Ee][Ss]})
+.if !empty(GO_MODULE:M[Yy][Ee][Ss])
MAKE_ENV+= GO111MODULE=on GOPATH=${WRKDIR}/.gopath GOPROXY=file://${WRKDIR}/.gopath/pkg/mod/
.else
MAKE_ENV+= GO111MODULE=off GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg
.endif
MAKE_ENV+= GOCACHE=${WRKDIR}/.cache/go-build
-.if !target(post-extract) && empty(${GO_MODULE:M[Yy][Ee][Ss]})
+.if !target(post-extract) && empty(GO_MODULE:M[Yy][Ee][Ss])
post-extract:
${RUN} ${MKDIR} ${WRKSRC}
${RUN} ${RM} -fr ${WRKDIR}/${GO_DIST_BASE}/.hg
@@ -104,7 +104,7 @@ do-install:
${RUN} cd ${WRKDIR}; [ ! -d pkg ] || ${PAX} -rw src pkg ${DESTDIR}${PREFIX}/gopkg
.endif
-.if !empty(${GO_MODULE:M[Yy][Ee][Ss]})
+.if !empty(GO_MODULE:M[Yy][Ee][Ss])
.PHONY: show-go-modules
show-go-modules:
cd ${WRKSRC} && ${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} get -d
Home |
Main Index |
Thread Index |
Old Index