diff options
| author | Etienne Champetier <champetier.etienne@gmail.com> | 2020-02-06 17:15:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 17:15:49 -0500 |
| commit | 2c86fac6f63f31b38be93e9acff970ac5c98b4c8 (patch) | |
| tree | e69ecfe4a86f414ecd2cb27ed1fda90b43cceae4 | |
| parent | 0bee095916481eb233a607d6f3b85ee4aa8333bb (diff) | |
| parent | f846ced1c89ac1a4b3f72b19040c7ef11a0791dd (diff) | |
Merge pull request #11265 from neheb/rhhethert
zabbix: remove configure patch
| -rw-r--r-- | admin/zabbix/Makefile | 8 | ||||
| -rw-r--r-- | admin/zabbix/patches/100-musl-compat.patch | 11 |
2 files changed, 5 insertions, 14 deletions
diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index 7630a8770..ba8a97f71 100644 --- 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 index 66762c98b..000000000 --- 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 \ |