Merge pull request #11265 from neheb/rhhethert

zabbix: remove configure patch

diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index 7630a8770b9e3c9e9221267b304e83e954db0b6b..ba8a97f71394bc1cf609d77a11d47174a77fe91e 100644 (file)
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zabbix
 PKG_VERSION:=4.0.16
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/zabbix
@@ -21,8 +21,7 @@ PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:zabbix:zabbix
 
 PKG_INSTALL:=1
-
-PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
 
 PKG_CONFIG_DEPENDS:= \
   CONFIG_ZABBIX_GNUTLS \
@@ -163,6 +162,9 @@ CONFIGURE_ARGS+= \
        $(if $(CONFIG_ZABBIX_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr") \
        $(if $(CONFIG_ZABBIX_OPENSSL),--with-openssl="$(STAGING_DIR)/usr")
 
+CONFIGURE_VARS += \
+       ac_cv_header_sys_sysinfo_h=no
+
 MAKE_FLAGS += ARCH="linux"
 
 define Package/zabbix/install/sbin

diff --git a/admin/zabbix/patches/100-musl-compat.patch b/admin/zabbix/patches/100-musl-compat.patch
deleted file mode 100644 (file)
index 66762c9..0000000
--- a/admin/zabbix/patches/100-musl-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -51,7 +51,7 @@ AC_CHECK_HEADERS(stdio.h stdlib.h string
-   syslog.h time.h errno.h sys/types.h sys/stat.h netinet/in.h \
-   math.h sys/socket.h dirent.h ctype.h \
-   mtent.h fcntl.h sys/param.h arpa/inet.h \
--  sys/vfs.h sys/pstat.h sys/sysinfo.h sys/statvfs.h sys/statfs.h \
-+  sys/vfs.h sys/pstat.h sys/statvfs.h sys/statfs.h \
-   sys/socket.h sys/loadavg.h arpa/inet.h \
-   sys/vmmeter.h strings.h vm/vm_param.h \
-   sys/time.h kstat.h sys/syscall.h sys/sysmacros.h \