Merge pull request #11265 from neheb/rhhethert
zabbix: remove configure patch
This commit is contained in:
commit
2c86fac6f6
2 changed files with 5 additions and 14 deletions
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=zabbix
|
PKG_NAME:=zabbix
|
||||||
PKG_VERSION:=4.0.16
|
PKG_VERSION:=4.0.16
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=3
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=@SF/zabbix
|
PKG_SOURCE_URL:=@SF/zabbix
|
||||||
|
@ -21,8 +21,7 @@ PKG_LICENSE_FILES:=COPYING
|
||||||
PKG_CPE_ID:=cpe:/a:zabbix:zabbix
|
PKG_CPE_ID:=cpe:/a:zabbix:zabbix
|
||||||
|
|
||||||
PKG_INSTALL:=1
|
PKG_INSTALL:=1
|
||||||
|
PKG_BUILD_PARALLEL:=1
|
||||||
PKG_FIXUP:=autoreconf
|
|
||||||
|
|
||||||
PKG_CONFIG_DEPENDS:= \
|
PKG_CONFIG_DEPENDS:= \
|
||||||
CONFIG_ZABBIX_GNUTLS \
|
CONFIG_ZABBIX_GNUTLS \
|
||||||
|
@ -163,6 +162,9 @@ CONFIGURE_ARGS+= \
|
||||||
$(if $(CONFIG_ZABBIX_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr") \
|
$(if $(CONFIG_ZABBIX_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr") \
|
||||||
$(if $(CONFIG_ZABBIX_OPENSSL),--with-openssl="$(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"
|
MAKE_FLAGS += ARCH="linux"
|
||||||
|
|
||||||
define Package/zabbix/install/sbin
|
define Package/zabbix/install/sbin
|
||||||
|
|
|
@ -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 \
|
|
Loading…
Reference in a new issue