summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2015-05-11 22:26:39 +0200
committerPeter Korsgaard <peter@korsgaard.com>2015-05-11 22:26:39 +0200
commit1951143a366920e33c6fe487c2d96272510e2cae (patch)
treefd72fee6e607cc4a0739d5f7811b67368398ea43
parent5c518ff7d2fb178a4a2a97839457ac16f9b31240 (diff)
downloadbuildroot-1951143a366920e33c6fe487c2d96272510e2cae.tar.gz
buildroot-1951143a366920e33c6fe487c2d96272510e2cae.zip
fbterm: fix linking issue when static linking and a toolchain with threads
Fixes: http://autobuild.buildroot.net/results/899/899eb7e36dc31b7dcb51c0dd23d91965111d22c4/ http://autobuild.buildroot.net/results/43a/43a34d8b64f536caa579709508bb5e00633ba6e7/ http://autobuild.buildroot.net/results/f34/f343d015b127f29d614e7ea38b173d3a5c270d84/ http://autobuild.buildroot.net/results/da8/da88f40dfc51aea122c146e5bfee19b031cfaab6/ And many more. Fontconfig uses pthreads if available, but fbterm forgets to link with it breaking static builds. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/fbterm/fbterm.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/package/fbterm/fbterm.mk b/package/fbterm/fbterm.mk
index 7e9d32441c..d78d6b75af 100644
--- a/package/fbterm/fbterm.mk
+++ b/package/fbterm/fbterm.mk
@@ -10,4 +10,10 @@ FBTERM_LICENSE = GPLv2+
FBTERM_LICENSE_FILES = COPYING
FBTERM_DEPENDENCIES = fontconfig liberation
+ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
+# fontconfig uses pthreads if available, but fbterm forgets to link
+# with it breaking static builds
+FBTERM_CONF_ENV += LIBS='-lpthread'
+endif
+
$(eval $(autotools-package))
OpenPOWER on IntegriCloud