From 7341eb827656208690ef7f65bd50196e6e1b05f7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 15 Feb 2014 11:49:36 +0100 Subject: [PATCH] collectd: fix static linking collectd-tg indirectly uses pthread, but forgets to link with -pthread. Signed-off-by: Peter Korsgaard --- package/collectd/collectd.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index e1fc10434b..84e17cdf68 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -6,7 +6,6 @@ COLLECTD_VERSION = 5.4.1 COLLECTD_SITE = http://collectd.org/files -COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm" COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes COLLECTD_INSTALL_STAGING = YES COLLECTD_LICENSE = GPLv2 LGPLv2.1 @@ -22,6 +21,16 @@ COLLECTD_PLUGINS_DISABLE = amqp apple_sensors aquaero ascent dbi email \ tokyotyrant uuid varnish vserver write_mongodb write_redis \ xmms zfs_arc +COLLECTD_LDFLAGS = $(TARGET_LDFLAGS) -lm + +ifeq ($(BR2_PREFER_STATIC_LIB),y) +# collectd-tg indirectly needs pthread but doesn't link with -pthread, +# causing static linker errors +COLLECTD_LDFLAGS += -lpthread +endif + +COLLECTD_CONF_ENV += LDFLAGS="$(COLLECTD_LDFLAGS)" + COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \ --localstatedir=/var --with-perl-bindings=no \ $(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \ -- 2.30.2