From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 2 Apr 2021 16:33:43 +0000 (+0200)
Subject: package/qpid-proton: fix build without C++
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=64f34fbcfeb373b839d43bb986812714540cec07;p=buildroot.git

package/qpid-proton: fix build without C++

Fixes:
 - http://autobuild.buildroot.org/results/05f344151100219c159ca4d466a453df96bf07fa

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr:
  - move code in thread condition, to avoid setting -DBUILD_CPP twice
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---

diff --git a/package/qpid-proton/qpid-proton.mk b/package/qpid-proton/qpid-proton.mk
index c1bcbd0d1a..4e03357261 100644
--- a/package/qpid-proton/qpid-proton.mk
+++ b/package/qpid-proton/qpid-proton.mk
@@ -33,7 +33,13 @@ QPID_PROTON_CONF_OPTS = \
 
 # epoll proactor unconditionally uses pthread and cpp (C++) bindings
 # unconditionally use proactor
-ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+QPID_PROTON_CONF_OPTS += -DBUILD_CPP=ON
+else
+QPID_PROTON_CONF_OPTS += -DBUILD_CPP=OFF
+endif
+else
 QPID_PROTON_CONF_OPTS += \
 	-DBUILD_CPP=OFF \
 	-DPROACTOR=none