From: Peter Korsgaard <peter@korsgaard.com>
Date: Tue, 12 May 2015 18:43:12 +0000 (+0200)
Subject: czmq: unbreak static linking
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aa5254f1a2bc0ea3181d51990c18681b3071b9db;p=buildroot.git

czmq: unbreak static linking

Fixes:
http://autobuild.buildroot.net/results/faf/faf0bb00fccb1350afaef55f6cf14c11a5f5dc3c/
http://autobuild.buildroot.net/results/8d2/8d279baa4c8bffbb01f897119092c7b736942df4/
http://autobuild.buildroot.net/results/4d3/4d3dea604da9a5a1e7fe20548813f8de474ae33f/
http://autobuild.buildroot.net/results/fd6/fd602617839817352763e51754553960b7f795ac/

And many more.

Zeromq uses C++, but czmq forgets to explicitly link with libstdc++
(or use g++ to link), breaking static linking.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/czmq/czmq.mk b/package/czmq/czmq.mk
index d25bf01c63..789e70027f 100644
--- a/package/czmq/czmq.mk
+++ b/package/czmq/czmq.mk
@@ -18,6 +18,12 @@ CZMQ_LICENSE_FILES = LICENSE
 # host-python, so disable asciidoc entirely.
 CZMQ_CONF_ENV = ac_cv_prog_czmq_have_asciidoc=no
 
+# zeromq uses C++, but czmq forgets to explicitly link with libstdc++
+# (or use g++ to link), breaking static linking.
+ifeq ($(BR2_STATIC_LIBS),y)
+CZMQ_CONF_ENV += LIBS='-lstdc++'
+endif
+
 define CZMQ_CREATE_CONFIG_DIR
 	mkdir -p $(@D)/config
 endef