diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2015-07-06 10:12:23 -0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-07-06 15:48:43 +0200 |
| commit | a562d2968ac3bff353030be8dab0a1990503000d (patch) | |
| tree | 791e477a4268470daa9d7d793b61c707cba2c59f | |
| parent | d3ec8172152352ad30ca6beacce9da89c4fd0807 (diff) | |
| download | buildroot-a562d2968ac3bff353030be8dab0a1990503000d.tar.gz buildroot-a562d2968ac3bff353030be8dab0a1990503000d.zip | |
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: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/collectd/0001-build-add-libavltree-libcommon-libheap-dependencies.patch | 21 | ||||
| -rw-r--r-- | package/collectd/collectd.mk | 2 |
2 files changed, 23 insertions, 0 deletions
diff --git a/package/collectd/0001-build-add-libavltree-libcommon-libheap-dependencies.patch b/package/collectd/0001-build-add-libavltree-libcommon-libheap-dependencies.patch new file mode 100644 index 0000000000..1ee1e7c524 --- /dev/null +++ b/package/collectd/0001-build-add-libavltree-libcommon-libheap-dependencies.patch @@ -0,0 +1,21 @@ +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 diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 7649f72839..6e1ea5ceae 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -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 = \ |
