|
From: <abe...@us...> - 2012-08-28 22:54:07
|
Revision: 5648
http://astlinux.svn.sourceforge.net/astlinux/?rev=5648&view=rev
Author: abelbeck
Date: 2012-08-28 22:54:00 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
zabbix, more build tweaks
Modified Paths:
--------------
branches/1.0/package/zabbix/Config.in
branches/1.0/package/zabbix/zabbix.mk
Added Paths:
-----------
branches/1.0/package/zabbix/zabbix-configure-long-long.patch
Modified: branches/1.0/package/zabbix/Config.in
===================================================================
--- branches/1.0/package/zabbix/Config.in 2012-08-28 18:02:54 UTC (rev 5647)
+++ branches/1.0/package/zabbix/Config.in 2012-08-28 22:54:00 UTC (rev 5648)
@@ -7,11 +7,12 @@
http://www.zabbix.com
config BR2_PACKAGE_ZABBIX_PROXY
- bool "zabbix_proxy"
+ bool "zabbix_proxy"
+ default n
depends on BR2_PACKAGE_ZABBIX
- default n
- help
- Zabbix proxy to be used with Zabbix Monitoring Solution
+ select BR2_PACKAGE_SQLITE
+ help
+ Zabbix proxy to be used with Zabbix Monitoring Solution
- http://www.zabbix.com
+ http://www.zabbix.com
Added: branches/1.0/package/zabbix/zabbix-configure-long-long.patch
===================================================================
--- branches/1.0/package/zabbix/zabbix-configure-long-long.patch (rev 0)
+++ branches/1.0/package/zabbix/zabbix-configure-long-long.patch 2012-08-28 22:54:00 UTC (rev 5648)
@@ -0,0 +1,27 @@
+--- zabbix-2.0.2/configure.in.orig 2012-08-28 16:44:23.000000000 -0500
++++ zabbix-2.0.2/configure.in 2012-08-28 16:50:02.000000000 -0500
+@@ -802,24 +802,6 @@
+
+ dnl Check for %qu format (FreeBSD 4.x)
+ dnl FreeBSD 4.x does not support %llu
+-AC_MSG_CHECKING(for long long format)
+-AC_TRY_RUN(
+-[
+-#include <sys/types.h>
+-int main()
+-{
+- uint64_t i;
+-
+- sscanf("200000000010020", "%qu", &i);
+-
+- if (i == 200000000010020) return 0;
+- else return -1;
+-}
+-],
+-AC_DEFINE(HAVE_LONG_LONG_QU, 1 ,[Define to 1 if format '%qu' exists.])
+-AC_MSG_RESULT(yes),
+-AC_MSG_RESULT(no))
+-
+ dnl option -rdynamic is needed for readable backtraces
+ AC_MSG_CHECKING(for -rdynamic linking option)
+ saved_LDFLAGS="$LDFLAGS"
Modified: branches/1.0/package/zabbix/zabbix.mk
===================================================================
--- branches/1.0/package/zabbix/zabbix.mk 2012-08-28 18:02:54 UTC (rev 5647)
+++ branches/1.0/package/zabbix/zabbix.mk 2012-08-28 22:54:00 UTC (rev 5648)
@@ -7,32 +7,30 @@
ZABBIX_VERSION = 2.0.2
ZABBIX_SOURCE = zabbix-$(ZABBIX_VERSION).tar.gz
ZABBIX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/zabbix
+ZABBIX_AUTORECONF = YES
ZABBIX_CONF_OPT = \
--enable-agent
ifeq ($(strip $(BR2_PACKAGE_ZABBIX_PROXY)),y)
-ZABBIX_CONF_OPT+= \
- --enable-proxy
-endif
+ZABBIX_DEPENDENCIES += sqlite
+ZABBIX_CONF_OPT += \
+ --enable-proxy \
+ --with-sqlite3="$(STAGING_DIR)/usr"
-ifeq ($(strip $(BR2_PACKAGE_CURL)),y)
-ZABBIX_CONF_OPT+= \
- --with-libcurl="$(STAGING_DIR)/usr/bin/curl-config"
-endif
+ ifeq ($(strip $(BR2_PACKAGE_CURL)),y)
+ZABBIX_DEPENDENCIES += libcurl
+ZABBIX_CONF_OPT += \
+ --with-libcurl="$(STAGING_DIR)/usr/bin/curl-config"
+ endif
-ifeq ($(strip $(BR2_PACKAGE_NETSNMP)),y)
-ZABBIX_CONF_OPT+= \
- --with-net-snmp="$(STAGING_DIR)/usr/bin/net-snmp-config"
+ ifeq ($(strip $(BR2_PACKAGE_NETSNMP)),y)
+ZABBIX_DEPENDENCIES += netsnmp
+ZABBIX_CONF_OPT += \
+ --with-net-snmp="$(STAGING_DIR)/usr/bin/net-snmp-config"
+ endif
endif
-
-ifeq ($(strip $(BR2_PACKAGE_SQLITE)),y)
-ZABBIX_CONF_OPT+= \
- --with-sqlite3="$(STAGING_DIR)"
-endif
-
-
define ZABBIX_CONFIGURE_CMDS
(cd $(@D); \
$(TARGET_CONFIGURE_ARGS) \
@@ -50,7 +48,10 @@
define ZABBIX_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -D $(@D)/src/zabbix_agent/zabbix_agentd $(TARGET_DIR)/usr/bin/zabbix_agentd
- $(INSTALL) -m 0755 -D $(@D)/src/zabbix_proxy/zabbix_proxy $(TARGET_DIR)/usr/bin/zabbix_proxy
+ if [ -f $(@D)/src/zabbix_proxy/zabbix_proxy ]; then \
+ $(INSTALL) -m 0755 -D $(@D)/src/zabbix_proxy/zabbix_proxy $(TARGET_DIR)/usr/bin/zabbix_proxy ; \
+ ln -sf /tmp/etc/zabbix_proxy.conf $(TARGET_DIR)/etc/zabbix_proxy.conf ; \
+ fi
$(INSTALL) -m 0755 -D package/zabbix/zabbix.init $(TARGET_DIR)/etc/init.d/zabbix
ln -sf /tmp/etc/zabbix_agentd.conf $(TARGET_DIR)/etc/zabbix_agentd.conf
endef
@@ -59,6 +60,8 @@
rm -f $(TARGET_DIR)/usr/bin/zabbix_agentd
rm -f $(TARGET_DIR)/usr/bin/zabbix_proxy
rm -f $(TARGET_DIR)/etc/init.d/zabbix
+ rm -f $(TARGET_DIR)/etc/zabbix_agentd.conf
+ rm -f $(TARGET_DIR)/etc/zabbix_proxy.conf
endef
-$(eval $(call AUTOTARGETS,package,zabbix,zabbix_proxy))
+$(eval $(call AUTOTARGETS,package,zabbix))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|