fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 11:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium/radeon: Add libamd_common.a to TARGET_LIB_DEPS also for r600

Browse source 
Fixes build failure with --enable-opencl --enable-xvmc:

make[4]: Entering directory '/home/daenzer/src/mesa-git/mesa/build-amd64/src/gallium/targets/xvmc'
  CXXLD    libXvMCgallium.la
../../../../src/gallium/drivers/r600/.libs/libr600.a(evergreen_compute.o): In function `evergreen_create_compute_state':
/home/daenzer/src/mesa-git/mesa/build-amd64/src/gallium/drivers/r600/../../../../../src/gallium/drivers/r600/evergreen_compute.c:254: undefined reference to `ac_elf_read'
../../../../src/gallium/drivers/r600/.libs/libr600.a(evergreen_compute.o): In function `r600_shader_binary_read_config':
/home/daenzer/src/mesa-git/mesa/build-amd64/src/gallium/drivers/r600/../../../../../src/gallium/drivers/r600/evergreen_compute.c:189: undefined reference to `ac_shader_binary_config_start'
/home/daenzer/src/mesa-git/mesa/build-amd64/src/gallium/drivers/r600/../../../../../src/gallium/drivers/r600/evergreen_compute.c:189: undefined reference to `ac_shader_binary_config_start'
collect2: error: ld returned 1 exit status
Makefile:760: recipe for target 'libXvMCgallium.la' failed

Fixes: dc4c551a34 ("radeon/ac: switch from radeon_elf_read() to ac_elf_read()")
Acked-by: Timothy Arceri <tarceri@itsqueeze.com>
Tested-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Michel Dänzer 2017-02-28 15:21:39 +09:00 • committed by Michel Dänzer
parent b8cd78eaa1
commit 936f5407a7
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/r600/Automake.inc
View file

@ -14,3 +14,8 @@ TARGET_RADEON_COMMON = \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la $(top_builddir)/src/gallium/drivers/radeon/libradeon.la
endif endif
if NEED_RADEON_LLVM
TARGET_LIB_DEPS += \
$(top_builddir)/src/amd/common/libamd_common.la
endif

1
src/gallium/drivers/radeonsi/Automake.inc
View file

@ -4,7 +4,6 @@ TARGET_DRIVERS += radeonsi
TARGET_CPPFLAGS += -DGALLIUM_RADEONSI TARGET_CPPFLAGS += -DGALLIUM_RADEONSI
TARGET_LIB_DEPS += \ TARGET_LIB_DEPS += \
$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
$(top_builddir)/src/amd/common/libamd_common.la \
$(RADEON_LIBS) \ $(RADEON_LIBS) \
$(LIBDRM_LIBS) \ $(LIBDRM_LIBS) \
$(AMDGPU_LIBS) $(AMDGPU_LIBS)