Skip to contentSkip to conversation

package/libnpupnp: needs gcc >= 7

PATCH Applied Bernd Kuhls 2 participants 4 messages Jul 4 – Jul 17

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/libnpupnp: needs gcc >= 7

Buildroot commit 2774502344f35b587ea8f1a2f43ec2398c3ebdad bumped the package from 4.2.2 to 6.2.3. Upstream added the usage of std::scoped_lock in version 6.2.0:
https://framagit.org/medoc92/npupnp/-/commit/a760b3278aee06408d9f50d0c54942f5ba9df989

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.

---
Series passed Gitlab pipelines:
https://gitlab.com/bkuhls/buildroot/-/commits/c8f5032e343bc13beaf098027b748575fecec56c

 package/libnpupnp/Config.in | 6 +++---
 package/libupnpp/Config.in  | 6 +++---
 package/upmpdcli/Config.in  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
package/libnpupnp/Config.in +3 -3
index cea5bd5c06..846bfe5217 100644
@@ -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
package/libupnpp/Config.in +3 -3
index 41afa9300f..634527622d 100644
@@ -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
package/upmpdcli/Config.in +3 -3
index 74eb768830..562d27db37 100644
@@ -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
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/2 package/libnpupnp: bump version to 6.3.0

Release notes:
https://www.lesbonscomptes.com/upmpdcli/pages/releases.html#LIBNPUPNP-6.3.0

---
Series passed Gitlab pipelines:
https://gitlab.com/bkuhls/buildroot/-/commits/c8f5032e343bc13beaf098027b748575fecec56c

 package/libnpupnp/libnpupnp.hash | 4 ++--
 package/libnpupnp/libnpupnp.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/libnpupnp/libnpupnp.hash +2 -2
index 9e4f211ecc..74d8fb685b 100644
@@ -1,5 +1,5 @@
-# From https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-6.2.3.tar.gz.sha256
-sha256  563d2a9e4afe603717343dc4667c0b89c6a017008ac6b52262da17a1e4f6bb96  libnpupnp-6.2.3.tar.gz
+# From https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-6.3.0.tar.gz.sha256
+sha256  082d999178291ed45ae24c3fd9e781120d3ec94d61d11121e5bac90c69365cda  libnpupnp-6.3.0.tar.gz
 
 # Hash for license file:
 sha256  c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3  COPYING
package/libnpupnp/libnpupnp.mk +1 -1
index 38b631fe58..97fdb6a5b0 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBNPUPNP_VERSION = 6.2.3
+LIBNPUPNP_VERSION = 6.3.0
 LIBNPUPNP_SITE = https://www.lesbonscomptes.com/upmpdcli/downloads
 LIBNPUPNP_LICENSE = BSD-3-Clause
 LIBNPUPNP_LICENSE_FILES = COPYING
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
In reply to Bernd Kuhls
Quoted 11 lines · Bernd Kuhls

Buildroot commit 2774502344f35b587ea8f1a2f43ec2398c3ebdad bumped the package from 4.2.2 to 6.2.3. Upstream added the usage of std::scoped_lock in version 6.2.0:
https://framagit.org/medoc92/npupnp/-/commit/a760b3278aee06408d9f50d0c54942f5ba9df989

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’

Quoted 6 lines

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.

Series applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw
In reply to Bernd Kuhls

In reply of:

Quoted 11 lines

Buildroot commit 2774502344f35b587ea8f1a2f43ec2398c3ebdad bumped the package from 4.2.2 to 6.2.3. Upstream added the usage of std::scoped_lock in version 6.2.0:
https://framagit.org/medoc92/npupnp/-/commit/a760b3278aee06408d9f50d0c54942f5ba9df989

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’

Quoted 6 lines

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.

Applied to 2026.05.x. Thanks

Quoted 83 lines

---
Series passed Gitlab pipelines:
https://gitlab.com/bkuhls/buildroot/-/commits/c8f5032e343bc13beaf098027b748575fecec56c

 package/libnpupnp/Config.in | 6 +++---
 package/libupnpp/Config.in  | 6 +++---
 package/upmpdcli/Config.in  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
package/libnpupnp/Config.in +3 -3
index cea5bd5c06..846bfe5217 100644
@@ -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
package/libupnpp/Config.in +3 -3
index 41afa9300f..634527622d 100644
@@ -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
package/upmpdcli/Config.in +3 -3
index 74eb768830..562d27db37 100644
@@ -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
Signature · 6 lines
2.47.3

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot