mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-24 05:53:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/qpid-proton: needs C++ and threads

Browse Source 
qpid-proton needs C++ (and so threads due to proactor) to avoid the
following build failure:

CMake Error at /nvmedata/autobuild/instance-3/output-1/host/share/cmake-3.18/Modules/CMakeTestCXXCompiler.cmake:59 (message):
  The C++ compiler

    "/usr/bin/c++"

  is not able to compile a simple test program.

C++ check can't easily be removed:
https://github.com/apache/qpid-proton/pull/366

Fixes:
 - http://autobuild.buildroot.org/results/76f8deccc9c4eee29eddf42586cc28e96eec0827

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Fabrice Fontaine 2022-05-21 22:43:48 +02:00 committed by Yann E. MORIN
parent dc08bff26c
commit f255a32211
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/qpid-proton/Config.in
View File

@ -1,6 +1,8 @@
config BR2_PACKAGE_QPID_PROTON config BR2_PACKAGE_QPID_PROTON
bool "qpid-proton" bool "qpid-proton"
depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_STATIC_LIBS # build a shared library depends on !BR2_STATIC_LIBS # build a shared library
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBUUID
help help
@ -13,5 +15,6 @@ config BR2_PACKAGE_QPID_PROTON
https://qpid.apache.org/proton/ https://qpid.apache.org/proton/
comment "qpid-proton needs a toolchain w/ dynamic library" comment "qpid-proton needs a toolchain w/ C++, dynamic library, threads"
depends on BR2_STATIC_LIBS depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
!BR2_TOOLCHAIN_HAS_THREADS

15
package/qpid-proton/qpid-proton.mk
View File

@ -23,6 +23,7 @@ QPID_PROTON_DEPENDENCIES = \
# go language binding is enabled when host-go is present # go language binding is enabled when host-go is present
# For now, disable all of them. # For now, disable all of them.
QPID_PROTON_CONF_OPTS = \ QPID_PROTON_CONF_OPTS = \
-DBUILD_CPP=ON \
-DBUILD_GO=OFF \ -DBUILD_GO=OFF \
-DBUILD_PYTHON=OFF \ -DBUILD_PYTHON=OFF \
-DBUILD_RUBY=OFF \ -DBUILD_RUBY=OFF \
@ -31,20 +32,6 @@ QPID_PROTON_CONF_OPTS = \
-DENABLE_WARNING_ERROR=OFF \ -DENABLE_WARNING_ERROR=OFF \
-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3
# epoll proactor unconditionally uses pthread and cpp (C++) bindings
# unconditionally use proactor
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
endif
ifeq ($(BR2_PACKAGE_JSONCPP),y) ifeq ($(BR2_PACKAGE_JSONCPP),y)
QPID_PROTON_DEPENDENCIES += jsoncpp QPID_PROTON_DEPENDENCIES += jsoncpp
QPID_PROTON_CONF_OPTS += -DENABLE_JSONCPP=ON QPID_PROTON_CONF_OPTS += -DENABLE_JSONCPP=ON