[packages/zabbix/go-vendor] Add go vendor mod patch

glen glen at pld-linux.org
Tue Aug 24 17:20:42 CEST 2021


commit 37d4eaa07984d8c7a4f94add5e5aea769e04be7b
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Aug 24 18:12:39 2021 +0300

    Add go vendor mod patch

 go-vendor.patch | 15 +++++++++++++++
 zabbix.spec     |  2 ++
 2 files changed, 17 insertions(+)
---
diff --git a/zabbix.spec b/zabbix.spec
index 5e3602c..54700ca 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -43,6 +43,7 @@ Patch0:		config.patch
 Patch1:		sqlite3_dbname.patch
 Patch2:		always_compile_ipc.patch
 Patch3:		go-destdir.patch
+Patch4:		go-vendor.patch
 URL:		https://www.zabbix.com/
 BuildRequires:	OpenIPMI-devel
 BuildRequires:	autoconf
@@ -334,6 +335,7 @@ This package provides the Zabbix Java Gateway.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
diff --git a/go-vendor.patch b/go-vendor.patch
new file mode 100644
index 0000000..fac756a
--- /dev/null
+++ b/go-vendor.patch
@@ -0,0 +1,15 @@
+--- 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
+@@ -40,10 +40,10 @@
+ all: build
+ 
+ zabbix.com/cmd/zabbix_agent2:
+-	CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2
++	CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -mod=vendor -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2
+ 
+ zabbix.com/cmd/zabbix_web_service:
+-	go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service
++	go build -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service
+ 
+ build: ${TARGETS}
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zabbix.git/commitdiff/37d4eaa07984d8c7a4f94add5e5aea769e04be7b



More information about the pld-cvs-commit mailing list