- rel 2, exclude internal pear deps

[packages/zabbix.git] / go-destdir.patch

diff --git a/go-destdir.patch b/go-destdir.patch
index 019e3a995244a765675ad6df786de6c2d5d8bad2..fcfc60fa3be65d6ce61f8c58e9d6acd941f49248 100644 (file)
--- a/go-destdir.patch
+++ b/go-destdir.patch
@@ -1,11 +1,20 @@
---- zabbix-5.2.3/src/go/Makefile.am~   2020-12-14 12:27:17.000000000 +0200
-+++ zabbix-5.2.3/src/go/Makefile.am    2021-08-24 15:25:21.065256983 +0300
-@@ -26,7 +26,7 @@
-       rm -f bin/zabbix_agent2 bin/mock_server
+--- zabbix-6.0.15/src/go/Makefile.am.orig      2023-04-02 01:39:06.004592284 +0200
++++ zabbix-6.0.15/src/go/Makefile.am   2023-04-02 01:40:27.811983809 +0200
+@@ -61,7 +61,7 @@
+       -rm -f sbom-zws.xml
  
- install:
+ install-golang.zabbix.com/agent2/cmd/zabbix_agent2:
 -      CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \
 +      CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=$(DESTDIR)${GOBIN} \
-               go install -ldflags="${GOLDFLAGS}" zabbix.com/cmd/zabbix_agent2
-       test -f "$(DESTDIR)@AGENT2_CONFIG_FILE@" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)@AGENT2_CONFIG_FILE@"
+               go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS}
+       $(MKDIR_P) "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)"
+       test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)"
+@@ -71,7 +71,7 @@
+       done
+ 
+ install-golang.zabbix.com/agent2/cmd/zabbix_web_service:
+-      GOBIN=${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}" golang.zabbix.com/agent2/cmd/zabbix_web_service
++      GOBIN=$(DESTDIR)${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}" golang.zabbix.com/agent2/cmd/zabbix_web_service
+ 
+ install-exec-local: ${INSTALL_TARGETS}