SF.net SVN: gar:[25811] csw/mgar/pkg/collectd/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Jul 8 11:50:49 CEST 2016
Revision: 25811
http://sourceforge.net/p/gar/code/25811
Author: dmichelsen
Date: 2016-07-08 09:50:48 +0000 (Fri, 08 Jul 2016)
Log Message:
-----------
collectd/trunk: Update to 5.5.1.1126.g37fe166
Modified Paths:
--------------
csw/mgar/pkg/collectd/trunk/Makefile
csw/mgar/pkg/collectd/trunk/checksums
Modified: csw/mgar/pkg/collectd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/collectd/trunk/Makefile 2016-07-07 19:06:26 UTC (rev 25810)
+++ csw/mgar/pkg/collectd/trunk/Makefile 2016-07-08 09:50:48 UTC (rev 25811)
@@ -1,13 +1,13 @@
# $Id$
#
NAME = collectd
-VERSION = 5.4.2
+VERSION = 5.5.1.1126.g37fe166
GARTYPE = v2
DESCRIPTION = Collects system performance statistics periodically
MASTER_SITES = http://collectd.org/files/
-DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += $(DISTNAME).tar.bz2
DISTFILES += cswcollectd
VENDOR_URL = http://collectd.org/
@@ -16,16 +16,34 @@
BUILD_DEP_PKGS += CSWlibgcrypt-dev
BUILD_DEP_PKGS += CSWnetsnmp-dev
BUILD_DEP_PKGS += CSWlibyajl-dev
+BUILD_DEP_PKGS += CSWliboping-dev
+BUILD_DEP_PKGS += CSWganglia-dev
+BUILD_DEP_PKGS += CSWrrdtool-dev
+BUILD_DEP_PKGS += CSWpython27-dev
+BUILD_DEP_PKGS += CSWlibcurl-dev
+BUILD_DEP_PKGS += CSWlibdbi-dev
+BUILD_DEP_PKGS += CSWpostgresql-dev
+BUILD_DEP_PKGS += CSWlibxmms-dev
+BUILD_DEP_PKGS += CSWlibpsl-dev
BUILD_DEP_PKGS += CSWjdk7
-EXTRA_CPPFLAGS = -D__EXTENSIONS__
+# We need asprintf
+LINKER_MAPS =
GARCOMPILER = GNU
-BUILD64 = 1
-# BUILD64_ONLY = 1
+# BUILD64 = 1
+BUILD64_ONLY = 1
ISAEXEC = 1
+###EXTRA_CPPFLAGS += -D__EXTENSIONS__
+
+# GCC 5 has C standards which are too new for the headers
+#EXTRA_CFLAGS += -std=c99
+###EXTRA_CPPFLAGS += -D_XPG6
+
+EXTRA_CFLAGS += -std=gnu99
+
CONFIGURE_ARGS += $(DIRPATHS)
# Disable for now and probably try this patch:
@@ -53,12 +71,21 @@
JAVA_CPPFLAGS = -I$(JAVA_HOME)/include
JAVA_LDFLAGS = -L$(JAVA_LIBDIR) -R$(JAVA_LIBDIR)
+# We need 'grep -q'
+CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
+
CONFIGURE_ARGS += --enable-java
CONFIGURE_ARGS += JAVAC="$(JAVAC)"
CONFIGURE_ARGS += JAR="$(JAR)"
CONFIGURE_ARGS += JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)"
CONFIGURE_ARGS += JAVA_LDFLAGS="$(JAVA_LDFLAGS)"
+CONFIGURE_ARGS += --enable-write_riemann
+CONFIGURE_ARGS += --disable-notify_desktop
+
+# This is Linux only
+# CONFIGURE_ARGS += --enable-protocols
+
CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
PACKAGES += CSWlibcollectdclient1
@@ -83,6 +110,8 @@
RUNTIME_DEP_PKGS_CSWcollectd += CSWlibxml2-2
RUNTIME_DEP_PKGS_CSWcollectd += CSWperl
RUNTIME_DEP_PKGS_CSWcollectd += CSWlibyajl2
+RUNTIME_DEP_PKGS_CSWcollectd += CSWliboping0
+RUNTIME_DEP_PKGS_CSWcollectd += CSWlibldap2-4-2
# These are pulled in because of a linker anomaly
RUNTIME_DEP_PKGS_CSWcollectd-sparc += CSWlibintl8
RUNTIME_DEP_PKGS_CSWcollectd-i386 += CSWlibmemcached8
Modified: csw/mgar/pkg/collectd/trunk/checksums
===================================================================
--- csw/mgar/pkg/collectd/trunk/checksums 2016-07-07 19:06:26 UTC (rev 25810)
+++ csw/mgar/pkg/collectd/trunk/checksums 2016-07-08 09:50:48 UTC (rev 25811)
@@ -1 +1 @@
-91bf74eccca479736fe88d3bcaacbf84 collectd-5.4.2.tar.gz
+7237d48fa0a42e7c3ee231b9c631b36e collectd-5.5.1.1126.g37fe166.tar.bz2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list