cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify MODGO_CMD environment customization

Browse Source 
Clear user's environment with SETENV and provide MODGO_ENV for adding variables
to environment and MODGO_GOPATH for altering GOPATH.

OK ajacoutot@, jasper@, kspillner@
This commit is contained in:
czarkoff 2016-05-08 12:29:17 +00:00
parent 36a5b5798b
commit a11a018bee
4 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/go/go.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: go.port.mk,v 1.8 2016/05/06 10:04:00 czarkoff Exp $
# $OpenBSD: go.port.mk,v 1.9 2016/05/08 12:29:17 czarkoff Exp $
ONLY_FOR_ARCHS ?= ${GO_ARCHS}
@ -21,7 +21,9 @@ SUBST_VARS += MODGO_TOOLS MODGO_PACKAGES MODGO_SOURCES
MODGO_SUBDIR ?= ${WRKDIST}
MODGO_TYPE ?= bin
MODGO_WORKSPACE ?= ${WRKDIR}/go
MODGO_CMD ?= unset GOPATH; export GOPATH="${MODGO_WORKSPACE}:${MODGO_PACKAGE_PATH}"; go
MODGO_GOPATH ?= ${MODGO_WORKSPACE}:${MODGO_PACKAGE_PATH}
MODGO_ENV += GOPATH="${MODGO_GOPATH}"
MODGO_CMD ?= ${SETENV} ${MODGO_ENV} go
MODGO_BUILD_CMD = ${MODGO_CMD} install ${MODGO_FLAGS}
MODGO_TEST_CMD = ${MODGO_CMD} test ${MODGO_FLAGS}

8
sysutils/beats/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.2 2016/04/26 21:29:43 jasper Exp $
# $OpenBSD: Makefile.inc,v 1.3 2016/05/08 12:29:17 czarkoff Exp $
PKGNAME ?= ${BEAT}-${VERSION}
@ -13,11 +13,7 @@ MODULES += lang/go
ELASTIC_BEAT ?= Yes
# Redefine ${MODGO_CMD} to include GO15VENDOREXPERIMENT
MODGO_CMD = unset GOPATH; \
export GO15VENDOREXPERIMENT=1 \
GOPATH="${MODGO_WORKSPACE}:${MODGO_PACKAGE_PATH}"; \
go
MODGO_ENV = GO15VENDOREXPERIMENT=1
.if ${ELASTIC_BEAT:L} == "yes"
HOMEPAGE ?= https://www.elastic.co/products/beats/${BEAT}

8
sysutils/packer/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2016/04/28 10:09:22 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2016/05/08 12:29:17 czarkoff Exp $
COMMENT= tool for building machine images
@ -19,10 +19,6 @@ WANTLIB += c pthread
MODULES= lang/go
# Redefine ${MODGO_CMD} to include GO15VENDOREXPERIMENT
MODGO_CMD= unset GOPATH; \
export GO15VENDOREXPERIMENT=1; \
export GOPATH="${MODGO_WORKSPACE}:${MODGO_PACKAGE_PATH}"; \
go
MODGO_ENV= GO15VENDOREXPERIMENT=1
.include <bsd.port.mk>

8
sysutils/terraform/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2016/05/05 10:46:50 czarkoff Exp $
# $OpenBSD: Makefile,v 1.6 2016/05/08 12:29:17 czarkoff Exp $
COMMENT= tool for building, changing, and versioning infrastructure
@ -20,11 +20,7 @@ WANTLIB += c pthread
MODULES= lang/go
# Redefine ${MODGO_CMD} to include GO15VENDOREXPERIMENT
MODGO_CMD= unset GOPATH; \
export GO15VENDOREXPERIMENT=1; \
export GOPATH="${MODGO_WORKSPACE}:${MODGO_PACKAGE_PATH}"; \
go
MODGO_ENV= GO15VENDOREXPERIMENT=1
PROVIDERS= atlas aws azure azurerm chef clc cloudflare cloudstack \
cobbler consul datadog digitalocean dme dnsimple \