Some users seem to have trouble compiling collectd 4.10.6. The needed patch
has apparently been already implemented upstream in 4.10.7 that was released
a few days ago. See ticket 11282: https://dev.openwrt.org/ticket/11282
I refreshed the patches and bumped the version.
The patch leaves one empty unnecessary file: 002-fix-ltdl-linking.patch
signed-off by: hannu.ny...@iki.fi
perus@HNVB:/Openwrt/trunk/feeds/packages$ patch -p1 -i collectd4107.patch
patching file utils/collectd/patches/900-add-iwinfo-plugin.patch
patching file utils/collectd/patches/002-fix-ltdl-linking.patch
patching file utils/collectd/patches/200-fix-git-describe-error.patch
patching file utils/collectd/Makefile
perus@HNVB:/Openwrt/trunk/feeds/packages$ cat collectd4107.patch
Index: packages/utils/collectd/patches/900-add-iwinfo-plugin.patch
===================================================================
--- packages/utils/collectd/patches/900-add-iwinfo-plugin.patch (revision 31283)
+++ packages/utils/collectd/patches/900-add-iwinfo-plugin.patch (working copy)
@@ -10,7 +10,7 @@
#
# Checks for typedefs, structures, and compiler characteristics.
#
-@@ -4006,6 +4009,7 @@ plugin_interface="no"
+@@ -4008,6 +4011,7 @@ plugin_interface="no"
plugin_ipmi="no"
plugin_ipvs="no"
plugin_irq="no"
@@ -18,7 +18,7 @@
plugin_libvirt="no"
plugin_load="no"
plugin_memory="no"
-@@ -4313,6 +4317,7 @@ AC_PLUGIN([ipmi], [$plugin_ipmi],
+@@ -4315,6 +4319,7 @@ AC_PLUGIN([ipmi], [$plugin_ipmi],
AC_PLUGIN([iptables], [$with_libiptc], [IPTables rule counters])
AC_PLUGIN([ipvs], [$plugin_ipvs], [IPVS connection statistics])
AC_PLUGIN([irq], [$plugin_irq], [IRQ statistics])
@@ -26,7 +26,7 @@
AC_PLUGIN([java], [$with_java], [Embed the Java Virtual
Machine])
AC_PLUGIN([libvirt], [$plugin_libvirt], [Virtual machine statistics])
AC_PLUGIN([load], [$plugin_load], [System load])
-@@ -4591,6 +4596,7 @@ Configuration:
+@@ -4593,6 +4598,7 @@ Configuration:
protobuf-c . . . . . $have_protoc_c
oracle . . . . . . . $with_oracle
python . . . . . . . $with_python
@@ -34,7 +34,7 @@
Features:
daemon mode . . . . . $enable_daemon
-@@ -4630,6 +4636,7 @@ Configuration:
+@@ -4632,6 +4638,7 @@ Configuration:
iptables . . . . . . $enable_iptables
ipvs . . . . . . . . $enable_ipvs
irq . . . . . . . . . $enable_irq
Index: packages/utils/collectd/patches/002-fix-ltdl-linking.patch
===================================================================
--- packages/utils/collectd/patches/002-fix-ltdl-linking.patch (revision 31283)
+++ packages/utils/collectd/patches/002-fix-ltdl-linking.patch (working copy)
@@ -1,22 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -85,7 +85,7 @@ endif
-
- if BUILD_WITH_OWN_LIBOCONFIG
- collectd_LDADD += $(LIBLTDL) liboconfig/liboconfig.la
--collectd_DEPENDENCIES += $(LIBLTDL) liboconfig/liboconfig.la
-+collectd_DEPENDENCIES += liboconfig/liboconfig.la
- else
- collectd_LDADD += -loconfig
- endif
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -57,7 +57,7 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT)
- @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
- @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
- @BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL)
liboconfig/liboconfig.la
--@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL)
liboconfig/liboconfig.la
-+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la
- @BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig
- @BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket
- @BUILD_AIX_TRUE@am__append_19 = -lm
Index: packages/utils/collectd/patches/200-fix-git-describe-error.patch
===================================================================
--- packages/utils/collectd/patches/200-fix-git-describe-error.patch
(revision 31283)
+++ packages/utils/collectd/patches/200-fix-git-describe-error.patch (working
copy)
@@ -2,7 +2,7 @@
+++ b/version-gen.sh
@@ -2,7 +2,7 @@
- DEFAULT_VERSION="4.10.6.git"
+ DEFAULT_VERSION="4.10.7.git"
-VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
+#VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
Index: packages/utils/collectd/Makefile
===================================================================
--- packages/utils/collectd/Makefile (revision 31283)
+++ packages/utils/collectd/Makefile (working copy)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=collectd
-PKG_VERSION:=4.10.6
+PKG_VERSION:=4.10.7
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://collectd.org/files/
-PKG_MD5SUM:=d446c399d839a32f2f581111d7256f8b
+PKG_MD5SUM:=f4193fdb5002ddac8159c88032a726bc
PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4
perus@HNVB:/Openwrt/trunk/feeds/packages$ patch -p1 -i collectd4107.patch
patching file utils/collectd/patches/900-add-iwinfo-plugin.patch
patching file utils/collectd/patches/002-fix-ltdl-linking.patch
patching file utils/collectd/patches/200-fix-git-describe-error.patch
patching file utils/collectd/Makefile
perus@HNVB:/Openwrt/trunk/feeds/packages$ cat collectd4107.patch
Index: packages/utils/collectd/patches/900-add-iwinfo-plugin.patch
===================================================================
--- packages/utils/collectd/patches/900-add-iwinfo-plugin.patch (revision 31283)
+++ packages/utils/collectd/patches/900-add-iwinfo-plugin.patch (working copy)
@@ -10,7 +10,7 @@
#
# Checks for typedefs, structures, and compiler characteristics.
#
-@@ -4006,6 +4009,7 @@ plugin_interface="no"
+@@ -4008,6 +4011,7 @@ plugin_interface="no"
plugin_ipmi="no"
plugin_ipvs="no"
plugin_irq="no"
@@ -18,7 +18,7 @@
plugin_libvirt="no"
plugin_load="no"
plugin_memory="no"
-@@ -4313,6 +4317,7 @@ AC_PLUGIN([ipmi], [$plugin_ipmi],
+@@ -4315,6 +4319,7 @@ AC_PLUGIN([ipmi], [$plugin_ipmi],
AC_PLUGIN([iptables], [$with_libiptc], [IPTables rule counters])
AC_PLUGIN([ipvs], [$plugin_ipvs], [IPVS connection statistics])
AC_PLUGIN([irq], [$plugin_irq], [IRQ statistics])
@@ -26,7 +26,7 @@
AC_PLUGIN([java], [$with_java], [Embed the Java Virtual
Machine])
AC_PLUGIN([libvirt], [$plugin_libvirt], [Virtual machine statistics])
AC_PLUGIN([load], [$plugin_load], [System load])
-@@ -4591,6 +4596,7 @@ Configuration:
+@@ -4593,6 +4598,7 @@ Configuration:
protobuf-c . . . . . $have_protoc_c
oracle . . . . . . . $with_oracle
python . . . . . . . $with_python
@@ -34,7 +34,7 @@
Features:
daemon mode . . . . . $enable_daemon
-@@ -4630,6 +4636,7 @@ Configuration:
+@@ -4632,6 +4638,7 @@ Configuration:
iptables . . . . . . $enable_iptables
ipvs . . . . . . . . $enable_ipvs
irq . . . . . . . . . $enable_irq
Index: packages/utils/collectd/patches/002-fix-ltdl-linking.patch
===================================================================
--- packages/utils/collectd/patches/002-fix-ltdl-linking.patch (revision 31283)
+++ packages/utils/collectd/patches/002-fix-ltdl-linking.patch (working copy)
@@ -1,22 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -85,7 +85,7 @@ endif
-
- if BUILD_WITH_OWN_LIBOCONFIG
- collectd_LDADD += $(LIBLTDL) liboconfig/liboconfig.la
--collectd_DEPENDENCIES += $(LIBLTDL) liboconfig/liboconfig.la
-+collectd_DEPENDENCIES += liboconfig/liboconfig.la
- else
- collectd_LDADD += -loconfig
- endif
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -57,7 +57,7 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT)
- @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
- @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
- @BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL)
liboconfig/liboconfig.la
--@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL)
liboconfig/liboconfig.la
-+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la
- @BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig
- @BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket
- @BUILD_AIX_TRUE@am__append_19 = -lm
Index: packages/utils/collectd/patches/200-fix-git-describe-error.patch
===================================================================
--- packages/utils/collectd/patches/200-fix-git-describe-error.patch
(revision 31283)
+++ packages/utils/collectd/patches/200-fix-git-describe-error.patch
(working copy)
@@ -2,7 +2,7 @@
+++ b/version-gen.sh
@@ -2,7 +2,7 @@
- DEFAULT_VERSION="4.10.6.git"
+ DEFAULT_VERSION="4.10.7.git"
-VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
+#VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
Index: packages/utils/collectd/Makefile
===================================================================
--- packages/utils/collectd/Makefile (revision 31283)
+++ packages/utils/collectd/Makefile (working copy)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=collectd
-PKG_VERSION:=4.10.6
+PKG_VERSION:=4.10.7
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://collectd.org/files/
-PKG_MD5SUM:=d446c399d839a32f2f581111d7256f8b
+PKG_MD5SUM:=f4193fdb5002ddac8159c88032a726bc
PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4
perus@HNVB:/Openwrt/trunk/feeds/packages$
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
