Commit a562d296 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Thomas Petazzoni
Browse files

collectd: fix parallel build issues 

For version 5.5.x a reorganization was made and some common funtionality
was moved to libraries, however proper dependency accounting isn't
handled in the Makefile thus causing build breakage on some parallel
builds. Fixes:
http://autobuild.buildroot.net/results/a5e/a5e6891e9ea66ac8216d3302da3702770ef7247b/



Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent d3ec8172

package/collectd/0001-build-add-libavltree-libcommon-libheap-dependencies.patch

0 → 100644
+21 −0
Original line number Diff line number Diff line 
build: add libavltree, libcommon & libheap dependencies



Otherwise it can break on very parallel builds since collectd link time

arrives before one or more of these were built.



Status: requested github pull (patch slightly different for newer rev).



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



diff -Nura collectd-5.5.0.orig/src/daemon/Makefile.am collectd-5.5.0/src/daemon/Makefile.am

--- collectd-5.5.0.orig/src/daemon/Makefile.am	2015-07-06 10:01:17.820506239 -0300

+++ collectd-5.5.0/src/daemon/Makefile.am	2015-07-06 10:02:03.364054763 -0300

@@ -49,7 +49,7 @@

 collectd_CFLAGS = $(AM_CFLAGS)

 collectd_LDFLAGS = -export-dynamic

 collectd_LDADD = libavltree.la libcommon.la libheap.la -lm

-collectd_DEPENDENCIES =

+collectd_DEPENDENCIES = libavltree.la libcommon.la libheap.la

 

 # Link to these libraries..

 if BUILD_WITH_LIBRT

package/collectd/collectd.mk

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes 
COLLECTD_INSTALL_STAGING = YES

COLLECTD_LICENSE = GPLv2 LGPLv2.1

COLLECTD_LICENSE_FILES = COPYING

# For 0001-build-add-libavltree-libcommon-libheap-dependencies.patch

COLLECTD_AUTORECONF = YES



# These require unmet dependencies, are fringe, pointless or deprecated

COLLECTD_PLUGINS_DISABLE = \