Skip to contentSkip to conversation

package/mpd: depends on gcc and host gcc >= 7

PATCH New Fabrice Fontaine 2 participants 2 messages Jan 17, 2021

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/mpd: depends on gcc and host gcc >= 7

mpd uses string_view since version 0.22 and
https://github.com/MusicPlayerDaemon/MPD/commit/fa45a8adfa44f6bc815ae7428770112c15c76d73

string_view is a C++17 feature:
https://github.com/MusicPlayerDaemon/MPD/commit/e0e5ed62ee98a0e21bc928f432a0051854193cd2

So add a dependency on host gcc >= 7

Moreover, C++17 is also mandatory on the target side since
https://github.com/MusicPlayerDaemon/MPD/commit/8f981845dc7376824d94fd24924788c582942929
so also bump the gcc dependency

Finally, drop BR2_TOOLCHAIN_HAS_GCC_BUG_64735 which is not needed as it will always be true with gcc >= 7

Fixes:
- http://autobuild.buildroot.org/results/e42a1d0cd808585a755754f839fe7d2080547191

---
Changes v1 -> v2 (after review of Yann E. Morin):
- Fix patch so it applies cleanly on master

 package/mpd/Config.in | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
package/mpd/Config.in +6 -7
index fbde82ab58..b19113d8c0 100644
@@ -5,8 +5,8 @@ menuconfig BR2_PACKAGE_MPD
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14
-	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17
+	depends on BR2_HOST_GCC_AT_LEAST_7 # C++17
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
@@ -405,11 +405,10 @@ config BR2_PACKAGE_MPD_ID3TAG
 
 endif
 
-comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 6"
+comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 7, host gcc >= 7"
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_6
-
-comment "mpd needs a toolchain not affected by GCC bug 64735"
-	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
+		!BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \
+		!BR2_HOST_GCC_AT_LEAST_7
Signature · 1 line
2.29.2
#1 lore raw

PATCH v2 1/1 package/mpd: depends on gcc and host gcc >= 7

Fabrice, All,

On 2021-01-17 12:04 +0100, Fabrice Fontaine spake thusly:

Quoted 12 lines

mpd uses string_view since version 0.22 and
https://github.com/MusicPlayerDaemon/MPD/commit/fa45a8adfa44f6bc815ae7428770112c15c76d73

string_view is a C++17 feature:
https://github.com/MusicPlayerDaemon/MPD/commit/e0e5ed62ee98a0e21bc928f432a0051854193cd2

So add a dependency on host gcc >= 7

Moreover, C++17 is also mandatory on the target side since
https://github.com/MusicPlayerDaemon/MPD/commit/8f981845dc7376824d94fd24924788c582942929
so also bump the gcc dependency

Quoted 7 lines

Finally, drop BR2_TOOLCHAIN_HAS_GCC_BUG_64735 which is not needed as it will always be true with gcc >= 7

Fixes:
- http://autobuild.buildroot.org/results/e42a1d0cd808585a755754f839fe7d2080547191

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 45 lines

---
Changes v1 -> v2 (after review of Yann E. Morin):
- Fix patch so it applies cleanly on master

 package/mpd/Config.in | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
package/mpd/Config.in +6 -7
index fbde82ab58..b19113d8c0 100644
@@ -5,8 +5,8 @@ menuconfig BR2_PACKAGE_MPD
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14
-	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17
+	depends on BR2_HOST_GCC_AT_LEAST_7 # C++17
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
@@ -405,11 +405,10 @@ config BR2_PACKAGE_MPD_ID3TAG
 
 endif
 
-comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 6"
+comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 7, host gcc >= 7"
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_6
-
-comment "mpd needs a toolchain not affected by GCC bug 64735"
-	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
+		!BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \
+		!BR2_HOST_GCC_AT_LEAST_7
Signature · 6 lines
2.29.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'