diff options
| author | yuri <yuri@FreeBSD.org> | 2018-03-18 11:55:13 +0800 |
|---|---|---|
| committer | yuri <yuri@FreeBSD.org> | 2018-03-18 11:55:13 +0800 |
| commit | ba56535693adcd2e40b4fb48d508de75302b3d9a (patch) | |
| tree | b65d8921393507062b83f17e806ad9e786e1ef9c /sysutils | |
| parent | 0422a6dd2375493154933f8e816f8020b8ea5d7a (diff) | |
| download | freebsd-ports-gnome-ba56535693adcd2e40b4fb48d508de75302b3d9a.tar.gz freebsd-ports-gnome-ba56535693adcd2e40b4fb48d508de75302b3d9a.tar.zst freebsd-ports-gnome-ba56535693adcd2e40b4fb48d508de75302b3d9a.zip | |
Made 14 Go ports respect MAKE_ENV. This is expected to unbreak them.
Ports:
www/fabio benchmarks/bombardier www/go-www net-mgmt/prometheus2 sysutils/immortal
sysutils/docker-freebsd audio/pms-devel sysutils/consul-alerts net-mgmt/pushgateway net/nsq
textproc/jid net-mgmt/alertmanager sysutils/nomad security/ssh-vault
Approved by: portmgr (port compliance, infrastructure)
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/consul-alerts/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/docker-freebsd/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/immortal/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/nomad/Makefile | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sysutils/consul-alerts/Makefile b/sysutils/consul-alerts/Makefile index 24e5f7152910..32c8dc98fffe 100644 --- a/sysutils/consul-alerts/Makefile +++ b/sysutils/consul-alerts/Makefile @@ -27,7 +27,7 @@ USE_RC_SUBR= ${PORTNAME} do-build: cd ${GO_WRKSRC} && \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \ -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/${PORTNAME} do-install: diff --git a/sysutils/docker-freebsd/Makefile b/sysutils/docker-freebsd/Makefile index 361ca75838b8..7102dab1e9a9 100644 --- a/sysutils/docker-freebsd/Makefile +++ b/sysutils/docker-freebsd/Makefile @@ -28,7 +28,7 @@ PLIST_FILES= bin/docker USE_RC_SUBR= docker do-build: - @cd ${WRKSRC} && export AUTO_GOPATH=1 && export DOCKER_GITCOMMIT=${GH_TAGNAME} && ./hack/make.sh binary + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} AUTO_GOPATH=1 DOCKER_GITCOMMIT=${GH_TAGNAME} ./hack/make.sh binary do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/bin diff --git a/sysutils/immortal/Makefile b/sysutils/immortal/Makefile index 4f3f565b5f36..d5a4826effad 100644 --- a/sysutils/immortal/Makefile +++ b/sysutils/immortal/Makefile @@ -24,13 +24,13 @@ GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} do-build: @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ "-s -w -X main.version=${PORTVERSION}" -o immortal cmd/immortal/main.go; @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ "-s -w -X main.version=${PORTVERSION}" -o immortalctl cmd/immortalctl/main.go; @cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \ "-s -w -X main.version=${PORTVERSION}" -o immortaldir cmd/immortaldir/main.go; do-install: diff --git a/sysutils/nomad/Makefile b/sysutils/nomad/Makefile index dbb718804398..23680342c9fe 100644 --- a/sysutils/nomad/Makefile +++ b/sysutils/nomad/Makefile @@ -27,7 +27,7 @@ GROUPS= nomad do-build: @cd ${WRKSRC}/src/github.com/hashicorp/nomad && \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \ + ${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \ -ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/nomad do-install: |