diff options
| author | Dmitri Goutnik <dmgk@FreeBSD.org> | 2022-05-29 16:54:42 -0500 |
|---|---|---|
| committer | Dmitri Goutnik <dmgk@FreeBSD.org> | 2022-06-06 13:19:10 -0500 |
| commit | b16eb860cc492d498eea6df7f481c93bbc851167 (patch) | |
| tree | ad4432a88cbf1b356c7f65aa9cb308f495f59123 /sysutils/datadog-agent/Makefile | |
| parent | */*: Introduce versioned Go ports (diff) | |
*/*: Repair after switching to versioned Go ports
- Add 1.17 to USES=go for ports that still need go117, remove GO_PORT;
- Add missing ${SETENV} ${MAKE_ENV} to repair BINARY_ALIAS;
- Remove explicit dependencies on lang/go.
PR: 264336
Reviewed by: ygy jwb yuri mikael drtr0jan@yandex.ru decke mat
Differential Revision: https://reviews.freebsd.org/D35346
Diffstat (limited to 'sysutils/datadog-agent/Makefile')
| -rw-r--r-- | sysutils/datadog-agent/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sysutils/datadog-agent/Makefile b/sysutils/datadog-agent/Makefile index c020d3595414..56c32fb5cb93 100644 --- a/sysutils/datadog-agent/Makefile +++ b/sysutils/datadog-agent/Makefile @@ -359,20 +359,20 @@ pre-build: ${MAKE_CMD} -C .) # Generate go source from templates - ${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/pkg/status/render.go - ${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/cmd/agent/gui/gui.go + ${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/pkg/status/render.go + ${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} GO111MODULE=off GOFLAGS="-mod=vendor" ${GO_CMD} generate ${WRKSRC}/cmd/agent/gui/gui.go post-build: # Generate config files - ${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go agent-py3 \ + ${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go agent-py3 \ ${WRKSRC}/pkg/config/config_template.yaml \ ${WRKSRC}/cmd/agent/dist/datadog.yaml - ${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go system-probe \ + ${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go system-probe \ ${WRKSRC}/pkg/config/config_template.yaml \ ${WRKSRC}/cmd/agent/dist/system-probe.yaml - ${SETENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go dogstatsd \ + ${SETENV} ${MAKE_ENV} ${GO_ENV} GOCACHE=${TMPDIR} ${GO_CMD} run ${WRKSRC}/pkg/config/render_config.go dogstatsd \ ${WRKSRC}/pkg/config/config_template.yaml \ ${WRKSRC}/cmd/agent/dist/dogstatsd.yaml |