mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 14:01:57 -09:00
Code Issues Packages Projects Releases Wiki Activity

collectd: fix static linking

Browse Source 
collectd-tg indirectly uses pthread, but forgets to link with -pthread.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2014-02-15 11:49:36 +01:00
parent 4b9a294e1c
commit 7341eb8276
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
package/collectd/collectd.mk
View File

@@ -6,7 +6,6 @@
COLLECTD_VERSION = 5.4.1 COLLECTD_VERSION = 5.4.1
COLLECTD_SITE = http://collectd.org/files COLLECTD_SITE = http://collectd.org/files
COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
COLLECTD_INSTALL_STAGING = YES COLLECTD_INSTALL_STAGING = YES
COLLECTD_LICENSE = GPLv2 LGPLv2.1 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 \ tokyotyrant uuid varnish vserver write_mongodb write_redis \
xmms zfs_arc 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 \ COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
--localstatedir=/var --with-perl-bindings=no \ --localstatedir=/var --with-perl-bindings=no \
$(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \ $(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \