diff mbox series

[v2,1/1] package/mesa3d: needs gcc >= 8

Message ID 20230523153347.419295-1-bernd.kuhls@t-online.de
State Accepted
Headers show
Series [v2,1/1] package/mesa3d: needs gcc >= 8 | expand

Commit Message

Bernd Kuhls May 23, 2023, 3:33 p.m. UTC
Needed since upstream commit
https://github.com/Mesa3D/mesa/commit/f9057cea517e01e05f08f00a741aad5bae154d62
which was first released with mesa3d-22.3.0, added to buildroot with
commit e4a1183d8f7d8422dbc23432248b984745a428b7.

Fixes:
http://autobuild.buildroot.net/results/011/01109560288f933019eea726a91c4109fbcca794/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: fixed typo

 package/intel-mediadriver/Config.in |  5 +++--
 package/mesa3d/Config.in            | 16 +++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

Comments

Arnout Vandecappelle June 3, 2023, 7:26 p.m. UTC | #1
On 23/05/2023 17:33, Bernd Kuhls wrote:
> Needed since upstream commit
> https://github.com/Mesa3D/mesa/commit/f9057cea517e01e05f08f00a741aad5bae154d62
> which was first released with mesa3d-22.3.0, added to buildroot with
> commit e4a1183d8f7d8422dbc23432248b984745a428b7.
> 
> Fixes:
> http://autobuild.buildroot.net/results/011/01109560288f933019eea726a91c4109fbcca794/
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

  Applied to master, thanks.

  Peter, this one is for 2023.02.x.

  Regards,
  Arnout

> ---
> v2: fixed typo
> 
>   package/intel-mediadriver/Config.in |  5 +++--
>   package/mesa3d/Config.in            | 16 +++++-----------
>   2 files changed, 8 insertions(+), 13 deletions(-)
> 
> diff --git a/package/intel-mediadriver/Config.in b/package/intel-mediadriver/Config.in
> index 537e4abd2f..c59437ec73 100644
> --- a/package/intel-mediadriver/Config.in
> +++ b/package/intel-mediadriver/Config.in
> @@ -3,6 +3,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER
>   	depends on BR2_x86_64
>   	depends on !BR2_STATIC_LIBS # mesa3d, libva
>   	depends on BR2_INSTALL_LIBSTDCPP # intel-gmmlib, mesa3d
> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # mesa3d
>   	depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d
>   	depends on BR2_TOOLCHAIN_HAS_THREADS # intel-gmmlib, libva
>   	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d
> @@ -28,7 +29,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER_GEN8
>   
>   endif # BR2_PACKAGE_INTEL_MEDIADRIVER
>   
> -comment "intel-mediadriver needs a toolchain w/ dynamic library, C++, NPTL"
> +comment "intel-mediadriver needs a toolchain w/ dynamic library, gcc >= 8, C++, NPTL"
>   	depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1
>   	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
> -		!BR2_TOOLCHAIN_HAS_THREADS_NPTL
> +		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_8
> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
> index b01aeb391b..df500f0491 100644
> --- a/package/mesa3d/Config.in
> +++ b/package/mesa3d/Config.in
> @@ -4,7 +4,7 @@ menuconfig BR2_PACKAGE_MESA3D
>   	depends on !BR2_STATIC_LIBS
>   	depends on BR2_TOOLCHAIN_HAS_SYNC_1
>   	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
> -	depends on !BR2_m68k || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # m68k needs gcc >= 7.x
> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8
>   	select BR2_PACKAGE_EXPAT
>   	select BR2_PACKAGE_LIBDRM
>   	select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND
> @@ -24,7 +24,6 @@ config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS
>   config BR2_PACKAGE_MESA3D_LLVM
>   	bool "llvm support"
>   	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
> -	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
>   	depends on BR2_TOOLCHAIN_HAS_THREADS
>   	depends on BR2_INSTALL_LIBSTDCPP
>   	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future
> @@ -33,10 +32,9 @@ config BR2_PACKAGE_MESA3D_LLVM
>   	depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm
>   	select BR2_PACKAGE_LLVM
>   
> -comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5"
> +comment "llvm support needs a toolchain w/ wchar, threads, C++, dynamic library, host gcc >= 5"
>   	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
> -	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \
> -		!BR2_TOOLCHAIN_GCC_AT_LEAST_5 \
> +	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \
>   		|| BR2_STATIC_LIBS || !BR2_USE_WCHAR \
>   		|| !BR2_HOST_GCC_AT_LEAST_5
>   
> @@ -392,11 +390,7 @@ config BR2_PACKAGE_PROVIDES_LIBOPENCL
>   
>   endif # BR2_PACKAGE_MESA3D
>   
> -comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library"
> +comment "mesa3d needs a toolchain w/ gcc >=8, C++, NPTL, dynamic library"
>   	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
> -		BR2_STATIC_LIBS
> +		BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8
>   	depends on BR2_TOOLCHAIN_HAS_SYNC_1
> -
> -comment "mesa3d needs a toolchain w/ gcc >= 7"
> -	depends on BR2_m68k
> -	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7
Peter Korsgaard June 14, 2023, 11:52 a.m. UTC | #2
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Needed since upstream commit
 > https://github.com/Mesa3D/mesa/commit/f9057cea517e01e05f08f00a741aad5bae154d62
 > which was first released with mesa3d-22.3.0, added to buildroot with
 > commit e4a1183d8f7d8422dbc23432248b984745a428b7.

 > Fixes:
 > http://autobuild.buildroot.net/results/011/01109560288f933019eea726a91c4109fbcca794/

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 > ---
 > v2: fixed typo

Committed to 2023.02.x, thanks.
diff mbox series

Patch

diff --git a/package/intel-mediadriver/Config.in b/package/intel-mediadriver/Config.in
index 537e4abd2f..c59437ec73 100644
--- a/package/intel-mediadriver/Config.in
+++ b/package/intel-mediadriver/Config.in
@@ -3,6 +3,7 @@  config BR2_PACKAGE_INTEL_MEDIADRIVER
 	depends on BR2_x86_64
 	depends on !BR2_STATIC_LIBS # mesa3d, libva
 	depends on BR2_INSTALL_LIBSTDCPP # intel-gmmlib, mesa3d
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # mesa3d
 	depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d
 	depends on BR2_TOOLCHAIN_HAS_THREADS # intel-gmmlib, libva
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d
@@ -28,7 +29,7 @@  config BR2_PACKAGE_INTEL_MEDIADRIVER_GEN8
 
 endif # BR2_PACKAGE_INTEL_MEDIADRIVER
 
-comment "intel-mediadriver needs a toolchain w/ dynamic library, C++, NPTL"
+comment "intel-mediadriver needs a toolchain w/ dynamic library, gcc >= 8, C++, NPTL"
 	depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1
 	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_HAS_THREADS_NPTL
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_8
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index b01aeb391b..df500f0491 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -4,7 +4,7 @@  menuconfig BR2_PACKAGE_MESA3D
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_SYNC_1
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
-	depends on !BR2_m68k || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # m68k needs gcc >= 7.x
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND
@@ -24,7 +24,6 @@  config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS
 config BR2_PACKAGE_MESA3D_LLVM
 	bool "llvm support"
 	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future
@@ -33,10 +32,9 @@  config BR2_PACKAGE_MESA3D_LLVM
 	depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm
 	select BR2_PACKAGE_LLVM
 
-comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5"
+comment "llvm support needs a toolchain w/ wchar, threads, C++, dynamic library, host gcc >= 5"
 	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_5 \
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \
 		|| BR2_STATIC_LIBS || !BR2_USE_WCHAR \
 		|| !BR2_HOST_GCC_AT_LEAST_5
 
@@ -392,11 +390,7 @@  config BR2_PACKAGE_PROVIDES_LIBOPENCL
 
 endif # BR2_PACKAGE_MESA3D
 
-comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library"
+comment "mesa3d needs a toolchain w/ gcc >=8, C++, NPTL, dynamic library"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
-		BR2_STATIC_LIBS
+		BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8
 	depends on BR2_TOOLCHAIN_HAS_SYNC_1
-
-comment "mesa3d needs a toolchain w/ gcc >= 7"
-	depends on BR2_m68k
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7