[Buildroot] [PATCH] package/mesa3d: add dependency on elfutils for R600 with LLVM

[Buildroot] [PATCH] package/mesa3d: add dependency on elfutils for R600 with LLVM

[Valentin Korenblit]

Gallium R600 needs libelf when mesa is built with llvm support.
Because of this, toolchain must use either uClibc or glibc, as
musl is not currently compatible with elfutils.

Signed-off-by: Valentin Korenblit <valentin.korenblit@smile.fr>
---
 package/mesa3d/Config.in | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 1476b39acc..bd3d050e29 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -97,13 +97,23 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU
 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600
 	bool "Gallium Radeon R600 driver"
 	depends on BR2_i386 || BR2_x86_64
+	depends on !BR2_PACKAGE_MESA3D_LLVM || \
+		(BR2_PACKAGE_MESA3D_LLVM && (BR2_TOOLCHAIN_USES_UCLIBC || \
+			BR2_TOOLCHAIN_USES_GLIBC)) # elfutils
 	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
 	select BR2_PACKAGE_LIBDRM_RADEON
 	select BR2_PACKAGE_LLVM_AMDGPU if BR2_PACKAGE_MESA3D_LLVM
+	select BR2_PACKAGE_ELFUTILS if BR2_PACKAGE_MESA3D_LLVM
 	select BR2_PACKAGE_MESA3D_NEEDS_XA
 	help
 	  Driver for ATI/AMD Radeon R600/R700/HD5000/HD6000 GPUs.
 
+# R600 needs libelf when Mesa3D is built with LLVM support
+# musl is not currently compatible with elfutils
+comment "R600 driver needs a uClibc or glibc toolchain when llvm is enabled"
+	depends on BR2_PACKAGE_MESA3D_LLVM
+	depends on !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
+
 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA
 	bool "Gallium vmware svga driver"
 	depends on BR2_i386 || BR2_x86_64
-- 
2.14.3

[Buildroot] [PATCH] package/mesa3d: add dependency on elfutils for R600 with LLVM

[Valentin Korenblit]

On 11/04/2018 14:57, Valentin Korenblit wrote:
> Gallium R600 needs libelf when mesa is built with llvm support.
> Because of this, toolchain must use either uClibc or glibc, as
> musl is not currently compatible with elfutils.
>
> Signed-off-by: Valentin Korenblit <valentin.korenblit@smile.fr>

This patch solves:
configure: error: r600 requires libelf when using llvm

Link to the autobuild log:

http://autobuild.buildroot.org/results/884/8845ff0f28d3273ebe884126b85cd7c4a905d81b/build-end.log

> ---
>   package/mesa3d/Config.in | 10 ++++++++++
>   1 file changed, 10 insertions(+)
>
> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
> index 1476b39acc..bd3d050e29 100644
> --- a/package/mesa3d/Config.in
> +++ b/package/mesa3d/Config.in
> @@ -97,13 +97,23 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU
>   config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600
>   	bool "Gallium Radeon R600 driver"
>   	depends on BR2_i386 || BR2_x86_64
> +	depends on !BR2_PACKAGE_MESA3D_LLVM || \
> +		(BR2_PACKAGE_MESA3D_LLVM && (BR2_TOOLCHAIN_USES_UCLIBC || \
> +			BR2_TOOLCHAIN_USES_GLIBC)) # elfutils
>   	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
>   	select BR2_PACKAGE_LIBDRM_RADEON
>   	select BR2_PACKAGE_LLVM_AMDGPU if BR2_PACKAGE_MESA3D_LLVM
> +	select BR2_PACKAGE_ELFUTILS if BR2_PACKAGE_MESA3D_LLVM
>   	select BR2_PACKAGE_MESA3D_NEEDS_XA
>   	help
>   	  Driver for ATI/AMD Radeon R600/R700/HD5000/HD6000 GPUs.
>   
> +# R600 needs libelf when Mesa3D is built with LLVM support
> +# musl is not currently compatible with elfutils
> +comment "R600 driver needs a uClibc or glibc toolchain when llvm is enabled"
> +	depends on BR2_PACKAGE_MESA3D_LLVM
> +	depends on !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
> +
>   config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA
>   	bool "Gallium vmware svga driver"
>   	depends on BR2_i386 || BR2_x86_64

[Buildroot] [PATCH] package/mesa3d: add dependency on elfutils for R600 with LLVM

[Thomas Petazzoni]

Hello,

On Wed, 11 Apr 2018 14:57:01 +0200, Valentin Korenblit wrote:
> Gallium R600 needs libelf when mesa is built with llvm support.
> Because of this, toolchain must use either uClibc or glibc, as
> musl is not currently compatible with elfutils.
> 
> Signed-off-by: Valentin Korenblit <valentin.korenblit@smile.fr>
> ---
>  package/mesa3d/Config.in | 10 ++++++++++
>  1 file changed, 10 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com