pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Some go module updates.
Module Name: pkgsrc-wip
Committed By: Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By: bsiegert
Date: Sun Mar 1 12:17:56 2020 +0100
Changeset: ddfa83406100e80fce5f960e393cd22a68d66f5b
Modified Files:
go/go-package.mk
Log Message:
Some go module updates.
With this change, building and installing wip/lf now works. However,
it still downloads stuff from the internet during the build.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ddfa83406100e80fce5f960e393cd22a68d66f5b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
go/go-package.mk | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diffs:
diff --git a/go/go-package.mk b/go/go-package.mk
index fb24524ddc..db122e8406 100644
--- a/go/go-package.mk
+++ b/go/go-package.mk
@@ -91,18 +91,22 @@ post-extract:
.if !target(do-build)
do-build:
- ${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} install -v ${GO_BUILD_PATTERN}
+ ${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} install -v ${GO_BUILD_PATTERN}
.endif
.if !target(do-test)
do-test:
- ${RUN} ${PKGSRC_SETENV} ${TEST_ENV} ${MAKE_ENV} ${GO} test -v ${GO_BUILD_PATTERN}
+ ${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${TEST_ENV} ${MAKE_ENV} ${GO} test -v ${GO_BUILD_PATTERN}
.endif
.if !target(do-install)
do-install:
+.if empty(GO_MODULE:M[Yy][Ee][Ss])
${RUN} cd ${WRKDIR}; [ ! -d bin ] || ${PAX} -rw bin ${DESTDIR}${PREFIX}
${RUN} cd ${WRKDIR}; [ ! -d pkg ] || ${PAX} -rw src pkg ${DESTDIR}${PREFIX}/gopkg
+.else
+ ${RUN} cd ${WRKDIR}/.gopath && [ ! -d bin ] || ${PAX} -rw bin ${DESTDIR}${PREFIX}
+.endif
.endif
.if !empty(GO_MODULE:M[Yy][Ee][Ss])
Home |
Main Index |
Thread Index |
Old Index