From 5d043799cd346b69bccdff78718677174133f0e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Wed, 7 Jun 2017 21:25:39 +0200 Subject: [PATCH] libupnpp: needs gcc >= 4.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After bumping libupnpp from version 0.15.1 to 0.15.2 compilation fails for toolchains using GCC 4.7: ``` libupnpp/control/discovery.cxx: In constructor 'UPnPClient::UPnPDeviceDirectory::UPnPDeviceDirectory(time_t)': libupnpp/control/discovery.cxx:338:5: error: 'yield' is not a member of 'std::this_thread' ``` Before version 0.15.2, libupnpp used sched_yield() which was replaced by `std::this_thread::yield()` in the new version. Looking at the `` header file of the PowerPC toolchain [1] from the autobuilder shows that `yield()` is only enabled if `_GLIBCXX_USE_SCHED_YIELD` is defined: ``` /// yield inline void yield() noexcept { __gthread_yield(); } ``` Note, that `__gthread_yield()` inlines to a call to `sched_yield()`: ``` static inline int __gthread_yield (void) { return __gthrw_(sched_yield) (); } ``` This macro is only defined if GCC was built with `--enable-libstdcxx-time`, which is obviously not the case for the affected toolchains. For GCC 4.7 and below this option defaults to no, which means `sched_yield()` is not enabled though it is be available. The issue was discussed on stackoverflow [2]. In GCC 4.9.0 the issue has been fixed, by automatically enabling `sched_yield()` on platforms that are known to support them. Therefore, we update the dependency to GCC 4.9. Fixes: http://autobuild.buildroot.net/results/506/50670d8119b4fbd26585d3d9bd646adb1d904dbe/ http://autobuild.buildroot.net/results/8b0/8b021648a073bde25dd6936ed1ea1e39977bf89b/ http://autobuild.buildroot.net/results/b6d/b6d7437e1cf8cf0b3726395401ac4ebd9af2833b/ http://autobuild.buildroot.net/results/0bf/0bf84f61a72a65a75c5fd0a787680f483cfead26/ .. and more. [1] http://autobuild.buildroot.org/toolchains/tarballs/powerpc-ctng_e500v2-linux-gnuspe.tar.xz [2] https://stackoverflow.com/a/12961816 Signed-off-by: Jörg Krause Signed-off-by: Peter Korsgaard --- package/libupnpp/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libupnpp/Config.in b/package/libupnpp/Config.in index 46abd65f02..84393f602b 100644 --- a/package/libupnpp/Config.in +++ b/package/libupnpp/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBUPNPP bool "libupnpp" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # libupnp - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBUPNP @@ -12,5 +12,5 @@ config BR2_PACKAGE_LIBUPNPP http://www.lesbonscomptes.com/upmpdcli/ -comment "libupnpp needs a toolchain w/ C++, threads, gcc >= 4.6" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 +comment "libupnpp needs a toolchain w/ C++, threads, gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9