mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-01 21:23:51 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libnpupnp: needs gcc >= 7

Browse Source 
Buildroot commit 2774502344 bumped the
package from 4.2.2 to 6.2.3. Upstream added the usage of
std::scoped_lock in version 6.2.0:
a760b3278a

causing a build error detected by the Gitlab pipelines for the
bootlin-aarch64-glibc-old defconfig:

../src/inc/upnpapi.h:132:22: error:
 ‘scoped_lock’ is not a member of ‘std’

scoped_lock was introduced in gcc 7.1:
https://gcc.gnu.org/onlinedocs/libstdc++/manual/status.html#status.iso.2017

so we raise the minimum required gcc version accordingly.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2026-07-04 12:06:59 +02:00
committed by Julien Olivain
parent b6fc5f19f1
commit 5f543cfcda
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/libnpupnp/Config.in
View File

@@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBNPUPNP
bool "libnpupnp"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBMICROHTTPD
@@ -13,6 +13,6 @@ config BR2_PACKAGE_LIBNPUPNP
https://www.lesbonscomptes.com/upmpdcli/libnpupnp.html
comment "libnpupnp needs a toolchain w/ C++, threads, gcc >= 4.9"
comment "libnpupnp needs a toolchain w/ C++, threads, gcc >= 7"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
!BR2_TOOLCHAIN_GCC_AT_LEAST_7

6
package/libupnpp/Config.in
View File

@@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBUPNPP
bool "libupnpp"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS # libnpupnp
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libnpupnp
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBNPUPNP
@@ -12,5 +12,5 @@ config BR2_PACKAGE_LIBUPNPP
http://www.lesbonscomptes.com/upmpdcli/
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
comment "libupnpp needs a toolchain w/ C++, threads, gcc >= 7"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7

6
package/upmpdcli/Config.in
View File

@@ -3,7 +3,7 @@ config BR2_PACKAGE_UPMPDCLI
depends on BR2_USE_MMU # fork()
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11, libupnpp
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libnpupnp -> libupnpp
select BR2_PACKAGE_JSONCPP
select BR2_PACKAGE_LIBMICROHTTPD
select BR2_PACKAGE_LIBMPDCLIENT
@@ -15,8 +15,8 @@ config BR2_PACKAGE_UPMPDCLI
http://www.lesbonscomptes.com/upmpdcli/
comment "upmpdcli needs a toolchain w/ C++, NPTL, gcc >= 4.9"
comment "upmpdcli needs a toolchain w/ C++, NPTL, gcc >= 7"
depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
!BR2_TOOLCHAIN_GCC_AT_LEAST_7