commit 219bbb7e1cd6a23bdeeb021c82b026006891f347
Author: Elan Ruusamäe <[email protected]>
Date: Tue Aug 24 15:26:31 2021 +0300
Add patch to fix go install dir
go-destdir.patch | 11 +++++++++++
zabbix.spec | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/zabbix.spec b/zabbix.spec
index 05370fc..27ee53f 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -34,6 +34,7 @@ Source7: %{name}_agentd.init
Patch0: config.patch
Patch1: sqlite3_dbname.patch
Patch2: always_compile_ipc.patch
+Patch3: go-destdir.patch
URL: http://zabbix.sourceforge.net/
BuildRequires: OpenIPMI-devel
BuildRequires: autoconf
@@ -293,10 +294,10 @@ This package provides the Zabbix Java Gateway.
%prep
%setup -q
-
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
diff --git a/go-destdir.patch b/go-destdir.patch
new file mode 100644
index 0000000..019e3a9
--- /dev/null
+++ b/go-destdir.patch
@@ -0,0 +1,11 @@
+--- 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
+
+ install:
+- 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@"
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zabbix.git/commitdiff/b711b6e8bef339c7c0dac45c2929370163fd4701
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
