]>
Commit | Line | Data |
---|---|---|
b0d487bd JP |
1 | --- zabbix-6.0.15/src/go/Makefile.am.orig 2023-04-02 01:41:24.660175099 +0200 |
2 | +++ zabbix-6.0.15/src/go/Makefile.am 2023-04-02 01:43:32.786108513 +0200 | |
3 | @@ -49,10 +49,10 @@ | |
e56a6d2d ER |
4 | all: build |
5 | ||
6 | zabbix.com/cmd/zabbix_agent2: | |
b0d487bd JP |
7 | - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2 |
8 | + CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -mod=vendor -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2 | |
e56a6d2d ER |
9 | |
10 | zabbix.com/cmd/zabbix_web_service: | |
11 | - go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service | |
12 | + go build -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service | |
13 | ||
14 | build: ${TARGETS} | |
15 | ||
b0d487bd | 16 | @@ -62,7 +62,7 @@ |
e56a6d2d ER |
17 | |
18 | install-zabbix.com/cmd/zabbix_agent2: | |
19 | CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=$(DESTDIR)${GOBIN} \ | |
20 | - go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS} | |
21 | + go install -mod=vendor -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS} | |
b0d487bd JP |
22 | $(MKDIR_P) "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)" |
23 | test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)" | |
24 | for cfg in conf/zabbix_agent2.d/plugins.d/*.conf; do \ | |
25 | @@ -71,7 +71,7 @@ | |
26 | done | |
e56a6d2d ER |
27 | |
28 | install-zabbix.com/cmd/zabbix_web_service: | |
29 | - GOBIN=$(DESTDIR)${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}" zabbix.com/cmd/zabbix_web_service | |
30 | + GOBIN=$(DESTDIR)${GOBIN} go install -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" zabbix.com/cmd/zabbix_web_service | |
31 | ||
32 | install-exec-local: ${INSTALL_TARGETS} | |
33 |