diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-03-04 13:19:46 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-03-04 13:20:25 +0100 |
| commit | 8e755e572f19b81006634246be2884cb33196678 (patch) | |
| tree | 26b080feb1ae9d54bcbc020d265fdb4b16423798 /package/collectd | |
| parent | 7dff800b02cb953191c9c77fa6609247fa4bfd9b (diff) | |
collectd: update to latest stable version
Diffstat (limited to 'package/collectd')
| -rw-r--r-- | package/collectd/Makefile | 6 | ||||
| -rw-r--r-- | package/collectd/patches/patch-configure | 29 | ||||
| -rw-r--r-- | package/collectd/patches/patch-src_Makefile_in | 12 |
3 files changed, 10 insertions, 37 deletions
diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 0b1e09539..5d751b303 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= collectd -PKG_VERSION:= 5.4.1 +PKG_VERSION:= 5.5.0 PKG_RELEASE:= 1 -PKG_HASH:= 853680936893df00bfc2be58f61ab9181fecb1cf45fc5cddcb7d25da98855f65 +PKG_HASH:= 5f7cfad5b24ed4f8b113cfb270e0f9e5a9f7c3af10443cb507fd40174a6c9028 PKG_DESCR:= system statistics collection daemon PKG_SECTION:= sys/misc PKG_BUILDDEP:= libtool @@ -33,6 +33,8 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,COLLECTD,collectd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +XAKE_FLAGS:= V=1 + ifneq (${ADK_PACKAGE_COLLECTD_WITH_CPU},y) DISABLE_CPU:=--disable-cpu endif diff --git a/package/collectd/patches/patch-configure b/package/collectd/patches/patch-configure deleted file mode 100644 index 41e8e65c7..000000000 --- a/package/collectd/patches/patch-configure +++ /dev/null @@ -1,29 +0,0 @@ ---- collectd-5.4.1.orig/configure 2014-01-26 09:10:00.000000000 +0100 -+++ collectd-5.4.1/configure 2014-04-10 16:56:47.000000000 +0200 -@@ -16812,7 +16812,7 @@ SAVE_CFLAGS="$CFLAGS" - # Emulate behavior of src/Makefile.am - if test "x$GCC" = "xyes" - then -- CFLAGS="$CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS -Wall" - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtok_r" >&5 -@@ -17388,7 +17388,7 @@ done - if test "x$GCC" = "xyes" - then - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -Wall -Wextra -Werror" -+ CFLAGS="$CFLAGS -Wall -Wextra" - fi - - for ac_func in strptime -@@ -23057,7 +23057,7 @@ then - SAVE_LDFLAGS="$LDFLAGS" - # trigger an error if Perl_load_module*() uses __attribute__nonnull__(3) - # (see issues #41 and #42) -- CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror" -+ CFLAGS="$CFLAGS $PERL_CFLAGS -Wall" - LDFLAGS="$LDFLAGS $PERL_LDFLAGS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken Perl_load_module()" >&5 diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in index e35859cfb..2099d922e 100644 --- a/package/collectd/patches/patch-src_Makefile_in +++ b/package/collectd/patches/patch-src_Makefile_in @@ -1,11 +1,11 @@ ---- collectd-5.4.1.orig/src/Makefile.in 2014-01-26 09:09:56.000000000 +0100 -+++ collectd-5.4.1/src/Makefile.in 2014-04-10 19:13:47.000000000 +0200 -@@ -2235,7 +2235,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ +--- collectd-5.5.0.orig/src/Makefile.in 2015-05-27 09:51:49.001922959 +0200 ++++ collectd-5.5.0/src/Makefile.in 2016-03-04 09:23:11.420569584 +0100 +@@ -2430,7 +2430,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - SUBDIRS = libcollectdclient $(am__append_1) + SUBDIRS = libcollectdclient $(am__append_1) daemon + PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\<module_register\>' -@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror +@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall - AM_CPPFLAGS = -DPREFIX='"${prefix}"' \ + AM_CPPFLAGS = -I$(srcdir)/daemon -DPREFIX='"${prefix}"' \ -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ -DLOCALSTATEDIR='"${localstatedir}"' \ |