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)
This commit is contained in:
Yuri Victorovich 2018-03-18 03:55:13 +00:00
parent 5d25accedb
commit d113af84d2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=464866
14 changed files with 17 additions and 17 deletions

View file

@ -45,7 +45,7 @@ post-extract:
do-build:
@cd ${WRKSRC}; \
${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-X main.buildVersion=${DISTVERSION}"
${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-X main.buildVersion=${DISTVERSION}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pms-${GH_TAGNAME} ${STAGEDIR}${PREFIX}/bin/${GO_PKGNAME}

View file

@ -20,7 +20,7 @@ PLIST_FILES= bin/${PORTNAME}
do-build:
cd ${WRKSRC}; \
${LN} -s vendor src; \
${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-X main.version=${PORTVERSION}" .
${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-X main.version=${PORTVERSION}" .
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

View file

@ -23,8 +23,8 @@ USERS= alertmanager
GROUPS= alertmanager
do-build:
@cd ${GO_WRKSRC}/cmd/alertmanager && ${SETENV} ${GO_ENV} go install
@cd ${GO_WRKSRC}/cmd/amtool && ${SETENV} ${GO_ENV} go install
@cd ${GO_WRKSRC}/cmd/alertmanager && ${SETENV} ${MAKE_ENV} ${GO_ENV} go install
@cd ${GO_WRKSRC}/cmd/amtool && ${SETENV} ${MAKE_ENV} ${GO_ENV} go install
do-install:
${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/alertmanager ${STAGEDIR}${PREFIX}/bin

View file

@ -36,7 +36,7 @@ PROMETHEUS_BINARIES= prometheus promtool
do-build:
.for bin in ${PROMETHEUS_BINARIES}
( cd ${GO_WRKSRC}/cmd/${bin} ; \
${SETENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" )
${SETENV} ${MAKE_ENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" )
.endfor
do-install:

View file

@ -24,7 +24,7 @@ USERS= prometheus
GROUPS= prometheus
do-build:
(cd ${GO_WRKSRC} ; ${SETENV} ${GO_ENV} go install)
@(cd ${GO_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GO_ENV} go install)
do-install:
${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/pushgateway ${STAGEDIR}${PREFIX}/bin

View file

@ -42,7 +42,7 @@ TARGETS= nsqd nsqlookupd nsqadmin nsq_pubsub nsq_to_nsq nsq_to_file \
.for _t in ${TARGETS}
build-${_t}:
cd ${GO_WRKSRC}/apps/${_t}; \
${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build \
${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build \
-ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/${_t}
install-${_t}:
${INSTALL_PROGRAM} ${GO_WRKSRC}/apps/${_t}/bin/${_t} \

View file

@ -28,7 +28,7 @@ post-patch:
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 ssh-vault cmd/ssh-vault/main.go;
do-install:

View file

@ -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:

View file

@ -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

View file

@ -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:

View file

@ -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:

View file

@ -27,6 +27,6 @@ PLIST_FILES= bin/jid
do-build:
@(cd ${WRKSRC}; \
${SETENV} ${GO_ENV} GOPATH=${WRKSRC} ${GO_CMD} build -v -o ${GO_WRKDIR_BIN}/jid cmd/jid/jid.go)
${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} ${GO_CMD} build -v -o ${GO_WRKDIR_BIN}/jid cmd/jid/jid.go)
.include <bsd.port.mk>

View file

@ -21,7 +21,7 @@ USE_RC_SUBR= fabio
do-build:
@cd ${WRKSRC}/src/github.com/fabiolb/fabio; \
${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \
${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \
-ldflags "-X main.GitDescribe=v${PORTVERSION}" -o bin/fabio
do-install:

View file

@ -27,7 +27,7 @@ post-patch:
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" -o www;
do-install: