[packages/zabbix] build agents and java once

atler atler at pld-linux.org
Fri Oct 31 01:22:59 CET 2025


commit 7ee28c6073b0b05780ffe038fb0e26414d4505bf
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Oct 30 12:16:40 2025 +0100

    build agents and java once

 zabbix.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/zabbix.spec b/zabbix.spec
index 4a107d0..feccdb2 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -378,13 +378,8 @@ This package provides the Zabbix Java Gateway.
 
 configure() {
 	%configure \
-	%{?with_java:ac_cv_prog_JAVAC=%{java_home}/bin/javac} \
-	%{?with_java:ac_cv_prog_JAR=%{java_home}/bin/jar} \
 	--enable-dependency-tracking \
-	--enable-agent \
-	%{__enable_disable agent2} \
 	--enable-ipv6 \
-	%{__enable_disable java} \
 	--with-ares \
 	--with-ldap \
 	--with-libcurl \
@@ -400,6 +395,11 @@ configure() {
 }
 
 configure \
+	%{?with_java:JAVAC=%{java_home}/bin/javac} \
+	%{?with_java:JAR=%{java_home}/bin/jar} \
+	--enable-agent \
+	%{__enable_disable agent2} \
+	%{__enable_disable java} \
 	--disable-server \
 	--disable-proxy
 
@@ -414,7 +414,10 @@ for database in %{databases} ; do
 	configure \
 		--with-$database \
 		$enable_server \
-		--enable-proxy
+		--enable-proxy \
+		--disable-agent \
+		--disable-agent2 \
+		--disable-java
 
 	%{__make}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zabbix.git/commitdiff/461e1e1a416e19603ecda3eb2ad25f98228cbab5



More information about the pld-cvs-commit mailing list