[Mesa-dev] [PATCH] Android: fix build break from r600/radeon split

[Marek Olšák]

Acked-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Wed, Oct 11, 2017 at 12:07 AM, Rob Herring <robh at kernel.org> wrote:
> Commit 06bfb2d28f7a ("r600: fork and import gallium/radeon") broke the
> Android build:
>
> external/mesa3d/src/gallium/drivers/radeon/r600_pipe_common.c:43:10: fatal error: 'llvm-c/TargetMachine.h' file not found
>          ^~~~~~~~~~~~~~~~~~~~~~~~
>
> Update the Android makefiles so that drivers/radeon is only built when
> radeonsi (and therefore LLVM) is enabled.
>
> Fixes: 06bfb2d28f7a (r600: fork and import gallium/radeon)
> Cc: Marek Olšák <marek.olsak at amd.com>
> Signed-off-by: Rob Herring <robh at kernel.org>
> ---
>  src/gallium/Android.mk                | 2 +-
>  src/gallium/drivers/r600/Android.mk   | 4 ++++
>  src/gallium/drivers/radeon/Android.mk | 2 +-
>  3 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
> index 97cb61a356ef..64e1e4513451 100644
> --- a/src/gallium/Android.mk
> +++ b/src/gallium/Android.mk
> @@ -41,7 +41,7 @@ SUBDIRS += winsys/i915/drm drivers/i915
>  SUBDIRS += winsys/nouveau/drm drivers/nouveau
>  SUBDIRS += winsys/pl111/drm drivers/pl111
>  SUBDIRS += winsys/radeon/drm drivers/r300
> -SUBDIRS += winsys/radeon/drm drivers/r600 drivers/radeon
> +SUBDIRS += winsys/radeon/drm drivers/r600
>  SUBDIRS += winsys/radeon/drm winsys/amdgpu/drm drivers/radeonsi drivers/radeon
>  SUBDIRS += winsys/vc4/drm drivers/vc4
>  SUBDIRS += winsys/virgl/drm winsys/virgl/vtest drivers/virgl
> diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk
> index 1683cfa09c9e..9f684cf2445e 100644
> --- a/src/gallium/drivers/r600/Android.mk
> +++ b/src/gallium/drivers/r600/Android.mk
> @@ -45,6 +45,10 @@ $(intermediates)/egd_tables.h: $(MESA_TOP)/src/gallium/drivers/r600/egd_tables.p
>         @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
>         $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/gallium/drivers/r600/egd_tables.py $(MESA_TOP)/src/gallium/drivers/r600/evergreend.h > $@
>
> +ifeq ($(MESA_ENABLE_LLVM),true)
> +$(call mesa-build-with-llvm)
> +endif
> +
>  include $(GALLIUM_COMMON_MK)
>  include $(BUILD_STATIC_LIBRARY)
>
> diff --git a/src/gallium/drivers/radeon/Android.mk b/src/gallium/drivers/radeon/Android.mk
> index c2d3a1cbce60..578ab0be91f9 100644
> --- a/src/gallium/drivers/radeon/Android.mk
> +++ b/src/gallium/drivers/radeon/Android.mk
> @@ -41,7 +41,7 @@ endif
>  include $(GALLIUM_COMMON_MK)
>  include $(BUILD_STATIC_LIBRARY)
>
> -ifneq ($(HAVE_GALLIUM_R600)$(HAVE_GALLIUM_RADEONSI),)
> +ifneq ($(HAVE_GALLIUM_RADEONSI),)
>  $(eval GALLIUM_LIBS += $(LOCAL_MODULE))
>  $(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES))
>  endif
> --
> 2.11.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev