]> TLD Linux GIT Repositories - packages/zabbix.git/blob - go.patch
- go build/install fixes
[packages/zabbix.git] / go.patch
1 diff -ur zabbix-6.0.19.orig/src/go/Makefile.am zabbix-6.0.19/src/go/Makefile.am
2 --- zabbix-6.0.19.orig/src/go/Makefile.am       2023-06-27 09:11:01.000000000 +0200
3 +++ zabbix-6.0.19/src/go/Makefile.am    2023-07-20 16:29:58.932599626 +0200
4 @@ -49,10 +49,10 @@
5  all: build
6  
7  zabbix.com/cmd/zabbix_agent2:
8 -       CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2
9 +       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
10  
11  zabbix.com/cmd/zabbix_web_service:
12 -       go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service
13 +       go build -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service
14  
15  build: ${TARGETS}
16  
17 @@ -61,8 +61,8 @@
18         rm -f bin/zabbix_agent2 bin/mock_server
19  
20  install-zabbix.com/cmd/zabbix_agent2:
21 -       CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \
22 -               go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS}
23 +       CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${DESTDIR}${GOBIN} \
24 +               go install -mod=vendor -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS}
25         $(MKDIR_P) "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)"
26         test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)"
27         for cfg in conf/zabbix_agent2.d/plugins.d/*.conf; do \
28 @@ -71,7 +71,7 @@
29         done
30  
31  install-zabbix.com/cmd/zabbix_web_service:
32 -       GOBIN=${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}" zabbix.com/cmd/zabbix_web_service
33 +       GOBIN=${DESTDIR}${GOBIN} go install -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" zabbix.com/cmd/zabbix_web_service
34  
35  install-exec-local: ${INSTALL_TARGETS}
36