commit d98dc99f41d6053ba41482fb664d8f8efd2bf5a1
Author: Elan Ruusamäe <[email protected]>
Date: Tue Aug 24 18:28:17 2021 +0300
fixup! Add go vendor mod patch
go-vendor.patch | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/go-vendor.patch b/go-vendor.patch
index fac756a..578c8fc 100644
--- a/go-vendor.patch
+++ b/go-vendor.patch
@@ -1,5 +1,5 @@
---- zabbix-5.4.3/src/go/Makefile.am~ 2021-08-24 17:53:45.000000000 +0300
-+++ zabbix-5.4.3/src/go/Makefile.am 2021-08-24 18:11:56.298334804 +0300
+--- zabbix-5.4.3/src/go/Makefile.am 2021-08-24 18:11:56.298334804 +0300
++++ zabbix-5.4.3/src/go/Makefile.am 2021-08-24 18:27:30.560260563 +0300
@@ -40,10 +40,10 @@
all: build
@@ -13,3 +13,16 @@
build: ${TARGETS}
+@@ -53,10 +53,10 @@
+
+ install-zabbix.com/cmd/zabbix_agent2:
+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}"
GOBIN=$(DESTDIR)${GOBIN} \
+- go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS}
++ go install -mod=vendor -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS}
+
+ install-zabbix.com/cmd/zabbix_web_service:
+- GOBIN=$(DESTDIR)${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}"
zabbix.com/cmd/zabbix_web_service
++ GOBIN=$(DESTDIR)${GOBIN} go install -mod=vendor
-ldflags="${WEBSERVICE_GOLDFLAGS}" zabbix.com/cmd/zabbix_web_service
+
+ install-exec-local: ${INSTALL_TARGETS}
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zabbix.git/commitdiff/d98dc99f41d6053ba41482fb664d8f8efd2bf5a1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
