diff options
| -rw-r--r-- | package/collectd/Config.in | 5 | ||||
| -rw-r--r-- | package/collectd/collectd.mk | 10 |
2 files changed, 4 insertions, 11 deletions
diff --git a/package/collectd/Config.in b/package/collectd/Config.in index a2e7877872..fbb4282d61 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_COLLECTD depends on BR2_USE_MMU depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_PREFER_STATIC_LIB help collectd is a daemon which collects system performance statistics periodically and provides mechanisms to store @@ -442,6 +443,6 @@ endmenu endif -comment "collectd needs a toolchain w/ IPv6, threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 +comment "collectd needs a toolchain w/ IPv6, threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || BR2_PREFER_STATIC_LIB depends on BR2_USE_MMU diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 84e17cdf68..90404060d4 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -21,15 +21,7 @@ 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_ENV += LIBS="-lm" COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \ --localstatedir=/var --with-perl-bindings=no \ |
