* [Buildroot] [PATCH 1/3] package/qpid-proton: fix build without threads
@ 2021-04-02 16:33 Fabrice Fontaine
2021-04-02 16:33 ` [Buildroot] [PATCH 2/3] package/pkg-cmake.mk: don't unconditionally set CMAKE_CXX_COMPILER Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Fabrice Fontaine @ 2021-04-02 16:33 UTC (permalink / raw)
To: buildroot
Build of qpid-proton is broken since bump to version 0.33.0 in commit
d4c0fde91da0d79204a21ed8de1bd410efa1c4d6 because epoll proactor
unconditonally uses pthread
Fixes:
- http://autobuild.buildroot.org/results/ec34da16a11f0600ecfbbbc4039e8210aea0498c
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...N-2355-Fix-build-with-DPROACTOR-none.patch | 61 +++++++++++++++++++
package/qpid-proton/qpid-proton.mk | 8 +++
2 files changed, 69 insertions(+)
create mode 100644 package/qpid-proton/0002-PROTON-2355-Fix-build-with-DPROACTOR-none.patch
diff --git a/package/qpid-proton/0002-PROTON-2355-Fix-build-with-DPROACTOR-none.patch b/package/qpid-proton/0002-PROTON-2355-Fix-build-with-DPROACTOR-none.patch
new file mode 100644
index 0000000000..c99a65f2f3
--- /dev/null
+++ b/package/qpid-proton/0002-PROTON-2355-Fix-build-with-DPROACTOR-none.patch
@@ -0,0 +1,61 @@
+From 2e3b81296020340692139f1a0d05c3bc7383b40e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= <jdanek@redhat.com>
+Date: Thu, 1 Apr 2021 19:24:33 +0200
+Subject: [PATCH] PROTON-2355: Fix build with -DPROACTOR=none (#302)
+
+epoll proactor unconditionally uses pthread.h which will result in the
+following build failure:
+
+[ 3%] Building C object c/CMakeFiles/qpid-proton-proactor-objects.dir/src/proactor/epoll.c.o
+In file included from /nvme/rc-buildroot-test/scripts/instance-0/output-1/build/qpid-proton-0.33.0/c/src/proactor/epoll.c:60:
+/nvme/rc-buildroot-test/scripts/instance-0/output-1/build/qpid-proton-0.33.0/c/src/proactor/epoll-internal.h:37:10: fatal error: pthread.h: No such file or directory
+ 37 | #include <pthread.h>
+ | ^~~~~~~~~~~
+
+To fix this failure, the user could use -DPROACTOR=none but it also
+fails on:
+
+CMake Error at c/CMakeLists.txt:481 (add_library):
+ Error evaluating generator expression:
+
+ $<TARGET_OBJECTS:qpid-proton-proactor-objects>
+
+ Objects of target "qpid-proton-proactor-objects" referenced but no such
+ target exists.
+
+Co-authored-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Retrieved from:
+https://github.com/apache/qpid-proton/commit/2e3b81296020340692139f1a0d05c3bc7383b40e]
+---
+ c/CMakeLists.txt | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt
+index 2146a5c96..e1119d11d 100644
+--- a/c/CMakeLists.txt
++++ b/c/CMakeLists.txt
+@@ -464,7 +464,11 @@ set(qpid-proton-noncore-src
+ ${qpid-proton-include-extra}
+ )
+
+-add_library (qpid-proton SHARED $<TARGET_OBJECTS:qpid-proton-core-objects> $<TARGET_OBJECTS:qpid-proton-platform-io-objects> $<TARGET_OBJECTS:qpid-proton-proactor-objects> ${qpid-proton-noncore-src})
++add_library (qpid-proton SHARED
++ $<TARGET_OBJECTS:qpid-proton-core-objects>
++ $<TARGET_OBJECTS:qpid-proton-platform-io-objects>
++ $<$<TARGET_EXISTS:qpid-proton-proactor-objects>:$<TARGET_OBJECTS:qpid-proton-proactor-objects>>
++ ${qpid-proton-noncore-src})
+ target_link_libraries (qpid-proton LINK_PRIVATE ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} ${PROACTOR_LIBS})
+ set_target_properties (qpid-proton
+ PROPERTIES
+@@ -480,7 +484,10 @@ if (BUILD_STATIC_LIBS)
+ C_EXTENSIONS ON)
+ add_library(qpid-proton-static STATIC $<TARGET_OBJECTS:qpid-proton-platform-io-static> ${qpid-proton-noncore-src})
+ target_compile_definitions(qpid-proton-static PUBLIC PROTON_DECLARE_STATIC)
+- target_link_libraries (qpid-proton-static qpid-proton-core-static qpid-proton-proactor-static ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} ${PROACTOR_LIBS})
++ target_link_libraries (qpid-proton-static
++ qpid-proton-core-static
++ $<$<TARGET_EXISTS:qpid-proton-proactor-static>:qpid-proton-proactor-static>
++ ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} ${PROACTOR_LIBS})
+ endif(BUILD_STATIC_LIBS)
+
+ # Install executables and libraries
diff --git a/package/qpid-proton/qpid-proton.mk b/package/qpid-proton/qpid-proton.mk
index b73ab8d6da..bbf953c472 100644
--- a/package/qpid-proton/qpid-proton.mk
+++ b/package/qpid-proton/qpid-proton.mk
@@ -31,6 +31,14 @@ QPID_PROTON_CONF_OPTS = \
-DENABLE_WARNING_ERROR=OFF \
-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python2
+# epoll proactor unconditionally uses pthread and cpp binding unconditionally
+# uses proactor
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
+QPID_PROTON_CONF_OPTS += \
+ -DBUILD_CPP=OFF \
+ -DPROACTOR=none
+endif
+
ifeq ($(BR2_PACKAGE_JSONCPP),y)
QPID_PROTON_DEPENDENCIES += jsoncpp
QPID_PROTON_CONF_OPTS += -DENABLE_JSONCPP=ON
--
2.30.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 2/3] package/pkg-cmake.mk: don't unconditionally set CMAKE_CXX_COMPILER 2021-04-02 16:33 [Buildroot] [PATCH 1/3] package/qpid-proton: fix build without threads Fabrice Fontaine @ 2021-04-02 16:33 ` Fabrice Fontaine 2021-04-02 21:52 ` Yann E. MORIN 2021-04-04 9:27 ` Peter Korsgaard 2021-04-02 16:33 ` [Buildroot] [PATCH 3/3] package/qpid-proton: fix build without C++ Fabrice Fontaine 2021-04-02 21:54 ` [Buildroot] [PATCH 1/3] package/qpid-proton: fix build without threads Yann E. MORIN 2 siblings, 2 replies; 7+ messages in thread From: Fabrice Fontaine @ 2021-04-02 16:33 UTC (permalink / raw) To: buildroot Don't unconditionally set CMAKE_CXX_COMPILER as it will raise a build failure on qpid-proton because "if the toolchain specifies a value for CMAKE_CXX_COMPILER, then CMake assumes the compiler works and goes straight ahead trying to use it": https://cmake.org/cmake/help/latest/module/CheckLanguage.html https://issues.apache.org/jira/browse/PROTON-2365 Fixes: - http://autobuild.buildroot.org/results/05f344151100219c159ca4d466a453df96bf07fa Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/pkg-cmake.mk | 1 + support/misc/toolchainfile.cmake.in | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index c001051002..53e6fb81f2 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -264,6 +264,7 @@ define TOOLCHAIN_CMAKE_INSTALL_FILES -e 's#@@TARGET_CXX@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_CXX)))#' \ -e 's#@@TARGET_FC@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_FC)))#' \ -e 's#@@CMAKE_SYSTEM_PROCESSOR@@#$(call qstrip,$(CMAKE_SYSTEM_PROCESSOR))#' \ + -e 's#@@BR2_INSTALL_LIBSTDCPP@@#$(if $(BR2_INSTALL_LIBSTDCPP),1,0)#' \ -e 's#@@TOOLCHAIN_HAS_FORTRAN@@#$(if $(BR2_TOOLCHAIN_HAS_FORTRAN),1,0)#' \ -e 's#@@CMAKE_BUILD_TYPE@@#$(if $(BR2_ENABLE_DEBUG),Debug,Release)#' \ $(TOPDIR)/support/misc/toolchainfile.cmake.in \ diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index b25031a656..c2318f9587 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -29,9 +29,7 @@ set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) # if the project forces some of these flag variables, Buildroot is # screwed up and there is nothing Buildroot can do about that :( set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") -set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") -set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") # Build type from the Buildroot configuration set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") @@ -44,7 +42,6 @@ set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configur # * and make sure the project's CMake code extends them like this if needed: # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dsome_definitions") set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") -set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") @@ -62,7 +59,12 @@ set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") # This toolchain file can be used both inside and outside Buildroot. set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") -set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") +if(@@BR2_INSTALL_LIBSTDCPP@@) + set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") + set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") + set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") + set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") +endif() if(@@TOOLCHAIN_HAS_FORTRAN@@) set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") -- 2.30.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 2/3] package/pkg-cmake.mk: don't unconditionally set CMAKE_CXX_COMPILER 2021-04-02 16:33 ` [Buildroot] [PATCH 2/3] package/pkg-cmake.mk: don't unconditionally set CMAKE_CXX_COMPILER Fabrice Fontaine @ 2021-04-02 21:52 ` Yann E. MORIN 2021-04-04 9:27 ` Peter Korsgaard 1 sibling, 0 replies; 7+ messages in thread From: Yann E. MORIN @ 2021-04-02 21:52 UTC (permalink / raw) To: buildroot Fabrice, All, On 2021-04-02 18:33 +0200, Fabrice Fontaine spake thusly: > Don't unconditionally set CMAKE_CXX_COMPILER as it will raise a build > failure on qpid-proton because "if the toolchain specifies a value for > CMAKE_CXX_COMPILER, then CMake assumes the compiler works and goes > straight ahead trying to use it": > https://cmake.org/cmake/help/latest/module/CheckLanguage.html > https://issues.apache.org/jira/browse/PROTON-2365 > > Fixes: > - http://autobuild.buildroot.org/results/05f344151100219c159ca4d466a453df96bf07fa > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, with the following changes: - rename placeholder Thanks! Regards, Yann E. MORIN. > --- > package/pkg-cmake.mk | 1 + > support/misc/toolchainfile.cmake.in | 10 ++++++---- > 2 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > index c001051002..53e6fb81f2 100644 > --- a/package/pkg-cmake.mk > +++ b/package/pkg-cmake.mk > @@ -264,6 +264,7 @@ define TOOLCHAIN_CMAKE_INSTALL_FILES > -e 's#@@TARGET_CXX@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_CXX)))#' \ > -e 's#@@TARGET_FC@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_FC)))#' \ > -e 's#@@CMAKE_SYSTEM_PROCESSOR@@#$(call qstrip,$(CMAKE_SYSTEM_PROCESSOR))#' \ > + -e 's#@@BR2_INSTALL_LIBSTDCPP@@#$(if $(BR2_INSTALL_LIBSTDCPP),1,0)#' \ > -e 's#@@TOOLCHAIN_HAS_FORTRAN@@#$(if $(BR2_TOOLCHAIN_HAS_FORTRAN),1,0)#' \ > -e 's#@@CMAKE_BUILD_TYPE@@#$(if $(BR2_ENABLE_DEBUG),Debug,Release)#' \ > $(TOPDIR)/support/misc/toolchainfile.cmake.in \ > diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in > index b25031a656..c2318f9587 100644 > --- a/support/misc/toolchainfile.cmake.in > +++ b/support/misc/toolchainfile.cmake.in > @@ -29,9 +29,7 @@ set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) > # if the project forces some of these flag variables, Buildroot is > # screwed up and there is nothing Buildroot can do about that :( > set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") > -set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") > set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") > -set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") > > # Build type from the Buildroot configuration > set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") > @@ -44,7 +42,6 @@ set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configur > # * and make sure the project's CMake code extends them like this if needed: > # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dsome_definitions") > set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") > -set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") > set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") > set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") > set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") > @@ -62,7 +59,12 @@ set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") > > # This toolchain file can be used both inside and outside Buildroot. > set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") > -set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") > +if(@@BR2_INSTALL_LIBSTDCPP@@) > + set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") > + set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") > + set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") > + set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") > +endif() > if(@@TOOLCHAIN_HAS_FORTRAN@@) > set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") > set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 2/3] package/pkg-cmake.mk: don't unconditionally set CMAKE_CXX_COMPILER 2021-04-02 16:33 ` [Buildroot] [PATCH 2/3] package/pkg-cmake.mk: don't unconditionally set CMAKE_CXX_COMPILER Fabrice Fontaine 2021-04-02 21:52 ` Yann E. MORIN @ 2021-04-04 9:27 ` Peter Korsgaard 1 sibling, 0 replies; 7+ messages in thread From: Peter Korsgaard @ 2021-04-04 9:27 UTC (permalink / raw) To: buildroot >>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > Don't unconditionally set CMAKE_CXX_COMPILER as it will raise a build > failure on qpid-proton because "if the toolchain specifies a value for > CMAKE_CXX_COMPILER, then CMake assumes the compiler works and goes > straight ahead trying to use it": > https://cmake.org/cmake/help/latest/module/CheckLanguage.html > https://issues.apache.org/jira/browse/PROTON-2365 > Fixes: > - http://autobuild.buildroot.org/results/05f344151100219c159ca4d466a453df96bf07fa > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2020.02.x, 2020.11.x and 2021.02.x, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 3/3] package/qpid-proton: fix build without C++ 2021-04-02 16:33 [Buildroot] [PATCH 1/3] package/qpid-proton: fix build without threads Fabrice Fontaine 2021-04-02 16:33 ` [Buildroot] [PATCH 2/3] package/pkg-cmake.mk: don't unconditionally set CMAKE_CXX_COMPILER Fabrice Fontaine @ 2021-04-02 16:33 ` Fabrice Fontaine 2021-04-02 21:54 ` Yann E. MORIN 2021-04-02 21:54 ` [Buildroot] [PATCH 1/3] package/qpid-proton: fix build without threads Yann E. MORIN 2 siblings, 1 reply; 7+ messages in thread From: Fabrice Fontaine @ 2021-04-02 16:33 UTC (permalink / raw) To: buildroot Fixes: - http://autobuild.buildroot.org/results/05f344151100219c159ca4d466a453df96bf07fa Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/qpid-proton/qpid-proton.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/qpid-proton/qpid-proton.mk b/package/qpid-proton/qpid-proton.mk index bbf953c472..ce1f0af773 100644 --- a/package/qpid-proton/qpid-proton.mk +++ b/package/qpid-proton/qpid-proton.mk @@ -31,6 +31,12 @@ QPID_PROTON_CONF_OPTS = \ -DENABLE_WARNING_ERROR=OFF \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python2 +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +QPID_PROTON_CONF_OPTS += -DBUILD_CPP=ON +else +QPID_PROTON_CONF_OPTS += -DBUILD_CPP=OFF +endif + # epoll proactor unconditionally uses pthread and cpp binding unconditionally # uses proactor ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -- 2.30.2 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 3/3] package/qpid-proton: fix build without C++ 2021-04-02 16:33 ` [Buildroot] [PATCH 3/3] package/qpid-proton: fix build without C++ Fabrice Fontaine @ 2021-04-02 21:54 ` Yann E. MORIN 0 siblings, 0 replies; 7+ messages in thread From: Yann E. MORIN @ 2021-04-02 21:54 UTC (permalink / raw) To: buildroot Fabrice, All, On 2021-04-02 18:33 +0200, Fabrice Fontaine spake thusly: > Fixes: > - http://autobuild.buildroot.org/results/05f344151100219c159ca4d466a453df96bf07fa > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, with the following changes: - move code in thread condition, to avoid setting -DBUILD_CPP twice Thanks! Regards, Yann E. MORIN. > --- > package/qpid-proton/qpid-proton.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/qpid-proton/qpid-proton.mk b/package/qpid-proton/qpid-proton.mk > index bbf953c472..ce1f0af773 100644 > --- a/package/qpid-proton/qpid-proton.mk > +++ b/package/qpid-proton/qpid-proton.mk > @@ -31,6 +31,12 @@ QPID_PROTON_CONF_OPTS = \ > -DENABLE_WARNING_ERROR=OFF \ > -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python2 > > +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) > +QPID_PROTON_CONF_OPTS += -DBUILD_CPP=ON > +else > +QPID_PROTON_CONF_OPTS += -DBUILD_CPP=OFF > +endif > + > # epoll proactor unconditionally uses pthread and cpp binding unconditionally > # uses proactor > ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 1/3] package/qpid-proton: fix build without threads 2021-04-02 16:33 [Buildroot] [PATCH 1/3] package/qpid-proton: fix build without threads Fabrice Fontaine 2021-04-02 16:33 ` [Buildroot] [PATCH 2/3] package/pkg-cmake.mk: don't unconditionally set CMAKE_CXX_COMPILER Fabrice Fontaine 2021-04-02 16:33 ` [Buildroot] [PATCH 3/3] package/qpid-proton: fix build without C++ Fabrice Fontaine @ 2021-04-02 21:54 ` Yann E. MORIN 2 siblings, 0 replies; 7+ messages in thread From: Yann E. MORIN @ 2021-04-02 21:54 UTC (permalink / raw) To: buildroot Fabrice, All, On 2021-04-02 18:33 +0200, Fabrice Fontaine spake thusly: > Build of qpid-proton is broken since bump to version 0.33.0 in commit > d4c0fde91da0d79204a21ed8de1bd410efa1c4d6 because epoll proactor > unconditonally uses pthread > > Fixes: > - http://autobuild.buildroot.org/results/ec34da16a11f0600ecfbbbc4039e8210aea0498c > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- [--SNIP--] > diff --git a/package/qpid-proton/qpid-proton.mk b/package/qpid-proton/qpid-proton.mk > index b73ab8d6da..bbf953c472 100644 > --- a/package/qpid-proton/qpid-proton.mk > +++ b/package/qpid-proton/qpid-proton.mk > @@ -31,6 +31,14 @@ QPID_PROTON_CONF_OPTS = \ > -DENABLE_WARNING_ERROR=OFF \ > -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python2 > > +# epoll proactor unconditionally uses pthread and cpp binding unconditionally > +# uses proactor I added a small clarification that 'CPP' in this context means C++, not cpp. Ain't it confusing? ;-) Applied to master, thanks. Regards, Yann E. MORIN. > +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) > +QPID_PROTON_CONF_OPTS += \ > + -DBUILD_CPP=OFF \ > + -DPROACTOR=none > +endif > + > ifeq ($(BR2_PACKAGE_JSONCPP),y) > QPID_PROTON_DEPENDENCIES += jsoncpp > QPID_PROTON_CONF_OPTS += -DENABLE_JSONCPP=ON > -- > 2.30.2 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-04-04 9:27 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-04-02 16:33 [Buildroot] [PATCH 1/3] package/qpid-proton: fix build without threads Fabrice Fontaine 2021-04-02 16:33 ` [Buildroot] [PATCH 2/3] package/pkg-cmake.mk: don't unconditionally set CMAKE_CXX_COMPILER Fabrice Fontaine 2021-04-02 21:52 ` Yann E. MORIN 2021-04-04 9:27 ` Peter Korsgaard 2021-04-02 16:33 ` [Buildroot] [PATCH 3/3] package/qpid-proton: fix build without C++ Fabrice Fontaine 2021-04-02 21:54 ` Yann E. MORIN 2021-04-02 21:54 ` [Buildroot] [PATCH 1/3] package/qpid-proton: fix build without threads Yann E. MORIN
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.