pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Do not use "naked" go invocations.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/96fa8b10a326
branches:  trunk
changeset: 310240:96fa8b10a326
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sun Jul 08 13:54:39 2018 +0000

description:
Do not use "naked" go invocations.

Use ${GO} instead.

diffstat:

 databases/mongo-tools/Makefile |  6 +++---
 security/vault/Makefile        |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 54f7246ddb68 -r 96fa8b10a326 databases/mongo-tools/Makefile
--- a/databases/mongo-tools/Makefile    Sun Jul 08 13:53:42 2018 +0000
+++ b/databases/mongo-tools/Makefile    Sun Jul 08 13:54:39 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/06/12 17:50:27 bsiegert Exp $
+# $NetBSD: Makefile,v 1.14 2018/07/08 13:54:39 bsiegert Exp $
 
 DISTNAME=      mongo-tools-3.4.4
 PKGREVISION=   1
@@ -37,7 +37,7 @@
 .for tool in ${MONGO_TOOLS}
        cd ${WRKSRC} && \
          ${SETENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor:${PREFIX}/gopkg \
-         go build -tags "${MONGO_TAGS}" -o bin/${tool} ${tool}/main/${tool}.go
+         ${GO} build -tags "${MONGO_TAGS}" -o bin/${tool} ${tool}/main/${tool}.go
 .endfor
 
 do-install:
@@ -45,6 +45,6 @@
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${DESTDIR}${PREFIX}/bin/${tool}
 .endfor
 
+.include "../../lang/go/version.mk"
 .include "../../devel/go-sys/buildlink3.mk"
-.include "../../lang/go/version.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 54f7246ddb68 -r 96fa8b10a326 security/vault/Makefile
--- a/security/vault/Makefile   Sun Jul 08 13:53:42 2018 +0000
+++ b/security/vault/Makefile   Sun Jul 08 13:54:39 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/06/12 17:50:27 bsiegert Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/08 13:54:39 bsiegert Exp $
 
 DISTNAME=      vault-0.10.1
 PKGREVISION=   1
@@ -23,7 +23,7 @@
        ${INSTALL_PROGRAM} ${WRKDIR}/bin/vault ${DESTDIR}${PREFIX}/bin
 
 do-test:
-       cd ${WRKSRC} && ${SETENV} GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg go test -v ./vault
+       cd ${WRKSRC} && ${SETENV} GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg ${GO} test -v ./vault
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index