[Mesa-dev] [PATCH v2 2/2] configure, r600: amd_common is needed only for OpenCL

[Jan Vesely]

v2: split off Android changes
    add comments

Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
Tested-By: Aaron Watry <awatry at gmail.com>
---

Aaron,

the diff is mostly the same as v1 (modulo comments),
hope you don't mind reusing your tested by.

Jan

 configure.ac                                | 4 +++-
 src/gallium/drivers/r600/Automake.inc       | 3 ++-
 src/gallium/targets/pipe-loader/Makefile.am | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5caf316..f1de421 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2631,7 +2631,9 @@ AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes)
 AM_CONDITIONAL(HAVE_RADEON_VULKAN, test "x$HAVE_RADEON_VULKAN" = xyes)
 AM_CONDITIONAL(HAVE_INTEL_VULKAN, test "x$HAVE_INTEL_VULKAN" = xyes)
 
-AM_CONDITIONAL(HAVE_AMD_DRIVERS, test "x$HAVE_GALLIUM_R600" = xyes -o \
+# FIXME: r600g still depends and amd_common (ac_binary*) when building OpenCL
+AM_CONDITIONAL(HAVE_AMD_DRIVERS, test \( "x$HAVE_GALLIUM_R600" = xyes -a \
+                                      "x$enable_opencl" = xyes \) -o \
                                       "x$HAVE_GALLIUM_RADEONSI" = xyes -o \
                                       "x$HAVE_RADEON_VULKAN" = xyes)
 
diff --git a/src/gallium/drivers/r600/Automake.inc b/src/gallium/drivers/r600/Automake.inc
index fa45735..642d527 100644
--- a/src/gallium/drivers/r600/Automake.inc
+++ b/src/gallium/drivers/r600/Automake.inc
@@ -13,7 +13,8 @@ TARGET_RADEON_WINSYS = \
 TARGET_RADEON_COMMON = \
 	$(top_builddir)/src/gallium/drivers/radeon/libradeon.la
 
-if HAVE_GALLIUM_LLVM
+# TODO: drop this dependency. libamd_common requires libdrm_amdgpu.
+if HAVE_AMD_DRIVERS
 TARGET_RADEON_COMMON += \
 	$(top_builddir)/src/amd/common/libamd_common.la
 endif
diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 5f629a2..b1ef07e 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -131,7 +131,8 @@ pipe_r600_la_LIBADD = \
 	$(LIBDRM_LIBS) \
 	$(RADEON_LIBS)
 
-if HAVE_GALLIUM_LLVM
+# TODO: drop this dependency. libamd_common requires libdrm_amdgpu.
+if HAVE_AMD_DRIVERS
 pipe_r600_la_LIBADD += \
 	$(top_builddir)/src/amd/common/libamd_common.la
 endif
-- 
2.9.4