From 996456e3240b8572349caf3290ea8ec8d6ff42b0 Mon Sep 17 00:00:00 2001
From: Kevin Daudt <kdaudt@alpinelinux.org>
Date: Wed, 27 Nov 2019 16:33:43 +0000
Subject: community/zabbix: enable agent2 for all arches

---
 community/zabbix/APKBUILD | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/community/zabbix/APKBUILD b/community/zabbix/APKBUILD
index 75f1f04d67a..8a53c36eabb 100644
--- a/community/zabbix/APKBUILD
+++ b/community/zabbix/APKBUILD
@@ -16,15 +16,15 @@ _php_depends="$_php $_php-gd $_php-curl $_php-bcmath $_php-sockets
 	$_php-gettext $_php-session $_php-simplexml $_php-json"
 makedepends="postgresql-dev curl-dev net-snmp-dev libevent-dev pcre-dev
 	sqlite-dev mariadb-connector-c-dev curl-dev openipmi-dev unixodbc-dev
-	libxml2-dev autoconf automake libssh2-dev gnutls-dev
+	libxml2-dev autoconf automake libssh2-dev gnutls-dev go
 	$_php_depends"
 install="$pkgname.pre-install"
 pkgusers="zabbix"
 pkggroups="zabbix"
 options="!check" # no tests available
-subpackages="$pkgname-doc $pkgname-agent $pkgname-pgsql $pkgname-mysql $pkgname-sqlite
+subpackages="$pkgname-doc $pkgname-agent $pkgname-agent2 $pkgname-pgsql $pkgname-mysql $pkgname-sqlite
 	$pkgname-webif::noarch $pkgname-utils $pkgname-setup::noarch
-	$pkgname-openrc $pkgname-agent-openrc:agent_openrc"
+	$pkgname-openrc $pkgname-agent-openrc:agent_openrc $pkgname-agent2-openrc:agent2_openrc"
 source="https://downloads.sourceforge.net/zabbix/zabbix-$pkgver.tar.gz
 	zabbix-server.initd
 	zabbix-server.confd
@@ -39,16 +39,6 @@ source="https://downloads.sourceforge.net/zabbix/zabbix-$pkgver.tar.gz
 	zabbix_agent2.conf.patch
 	"
 
-# Agent2 does not build on x86 atm
-case $CARCH in
-x86|armv7|armhf)
-	_build_agent2=false;;
-*)
-	subpackages="$subpackages $pkgname-agent2 $pkgname-agent2-openrc:agent2_openrc"
-	makedepends="$makedepends go"
-	_build_agent2=true;;
-esac
-
 # security fixes:
 #   3.0.4-r0:
 #   - CVE N/A ZBX-11023
@@ -73,6 +63,7 @@ build() {
 			--mandir=/usr/share/man \
 			--infodir=/usr/share/info \
 			--enable-agent \
+			--enable-agent2 \
 			--enable-proxy \
 			--enable-ipv6 \
 			--with-net-snmp \
@@ -84,10 +75,6 @@ build() {
 			--with-gnutls
 			"
 
-	if $_build_agent2; then
-		_configure="$_configure --enable-agent2"
-	fi
-
 	export GOPATH="$builddir"
 	# pass --export-dynamic to the linker
 	# to make zabbix loadable modules work
@@ -122,11 +109,7 @@ build() {
 
 package() {
 	# doing manual install
-	components="agentd proxy server";
-	if $_build_agent2; then
-		msg2 "Packaging agen2"
-		components="$components agent2"
-	fi
+	components="agentd proxy server agent2";
 
 	for i in $components; do
 		install -D -m755 "$builddir"/man/zabbix_$i.man \
-- 
cgit v1.2.3