fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: Link to libX11-xcb only when unneeded

Browse source 
The Makefile unconditionally linked libX11-xcb into libvulkan_intel.so.
But it's needed only if HAVE_PLATFORM_X11.

Fixes build of libvulkan_intel.so on Chromium OS, which has no X11
libraries.

Fixes: 71258e9462 ("anv/x11: Add support for Xlib platform")
Cc: Kevin Strasser <kevin.strasser@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Chad Versace 2016-09-07 20:07:50 -07:00
parent 7514e326f8
commit bad80c26e7
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/intel/vulkan/Makefile.am
View file

@ -91,7 +91,9 @@ AM_CPPFLAGS += \
-DVK_USE_PLATFORM_XLIB_KHR
VULKAN_SOURCES += $(VULKAN_WSI_X11_FILES)
VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS)
# FIXME: Use pkg-config for X11-xcb ldflags.
VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS) -lX11-xcb
endif
@ -149,7 +151,7 @@ EXTRA_DIST = \
dev_icd.json.in \
intel_icd.json
libvulkan_intel_la_LIBADD = $(VULKAN_LIB_DEPS) -lX11-xcb
libvulkan_intel_la_LIBADD = $(VULKAN_LIB_DEPS)
libvulkan_intel_la_LDFLAGS = \
-shared \
@ -184,7 +186,7 @@ intel_icd.json : intel_icd.json.in
# Libvulkan with dummy gem. Used for unit tests.
libvulkan_test_la_SOURCES = $(VULKAN_GEM_STUB_FILES)
libvulkan_test_la_LIBADD = $(VULKAN_LIB_DEPS) -lX11-xcb
libvulkan_test_la_LIBADD = $(VULKAN_LIB_DEPS)
include $(top_srcdir)/install-lib-links.mk