diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-15 10:27:47 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-15 10:27:47 +0200 |
commit | 08d14cc838c8f2e24bd7cf23bb04503433680934 (patch) | |
tree | 97ead6c0cd7561532abf2edab7106eaee5bd634d | |
parent | 2ec7ae69b929695da73ac5097785114569495f42 (diff) |
update to latest upstream version
-rw-r--r-- | package/collectd/Makefile | 4 | ||||
-rw-r--r-- | package/collectd/patches/patch-configure | 56 | ||||
-rw-r--r-- | package/collectd/patches/patch-src_libcollectdclient_Makefile_in | 6 |
3 files changed, 61 insertions, 5 deletions
diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 0e81c8345..1dbb26fc5 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= collectd -PKG_VERSION:= 4.9.1 +PKG_VERSION:= 4.10.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 31a63d8e3a796dee247024f70426ed1c +PKG_MD5SUM:= c473cf8e9f22f5a9f7ef4c5be1b0c436 PKG_DESCR:= System statistics collection daemon PKG_SECTION:= console PKG_DEPENDS:= libpthread diff --git a/package/collectd/patches/patch-configure b/package/collectd/patches/patch-configure new file mode 100644 index 000000000..24d0c04b5 --- /dev/null +++ b/package/collectd/patches/patch-configure @@ -0,0 +1,56 @@ +--- collectd-4.10.0.orig/configure 2010-05-01 11:16:01.000000000 +0200 ++++ collectd-4.10.0/configure 2010-06-14 15:51:32.263465769 +0200 +@@ -16636,53 +16636,6 @@ $as_echo "#define HAVE_GEN_GETMNTENT 1" + + fi + +-# Check for htonll +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if have htonll defined" >&5 +-$as_echo_n "checking if have htonll defined... " >&6; } +- +- have_htonll="no" +- if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run test program while cross compiling +-See \`config.log' for more details." "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-#include <sys/types.h> +-#include <netinet/in.h> +-#if HAVE_INTTYPES_H +-# include <inttypes.h> +-#endif +- +-int +-main () +-{ +- +- return htonll(0); +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- +- have_htonll="yes" +- +-$as_echo "#define HAVE_HTONLL 1" >>confdefs.h +- +- +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_htonll" >&5 +-$as_echo "$have_htonll" >&6; } + + # Check for structures + ac_fn_c_check_member "$LINENO" "struct if_data" "ifi_ibytes" "ac_cv_member_struct_if_data_ifi_ibytes" " diff --git a/package/collectd/patches/patch-src_libcollectdclient_Makefile_in b/package/collectd/patches/patch-src_libcollectdclient_Makefile_in index ba4d4c067..a51a010ea 100644 --- a/package/collectd/patches/patch-src_libcollectdclient_Makefile_in +++ b/package/collectd/patches/patch-src_libcollectdclient_Makefile_in @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- collectd-4.6.2.orig/src/libcollectdclient/Makefile.in 2009-03-18 11:56:40.000000000 +0100 -+++ collectd-4.6.2/src/libcollectdclient/Makefile.in 2009-05-09 16:29:33.000000000 +0200 -@@ -251,7 +251,7 @@ top_build_prefix = @top_build_prefix@ +--- collectd-4.10.0.orig/src/libcollectdclient/Makefile.in 2010-05-01 11:16:00.000000000 +0200 ++++ collectd-4.10.0/src/libcollectdclient/Makefile.in 2010-06-14 15:49:28.563473998 +0200 +@@ -327,7 +327,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies |