0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From b1d2a82d644518c1a75775244ac63be738aaf062 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Fri, 19 Apr 2019 10:19:50 +0200
  4. Subject: [PATCH] hw/xwayland/Makefile.am: fix build without glx
  5. Commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b added libglxvnd.la to
  6. Xwayland_LDFLAGS but GLX can be disabled through --disable-glx.
  7. In this case, build fails on:
  8. make[3]: *** No rule to make target '../../glx/libglxvnd.la', needed by 'Xwayland'. Stop.
  9. make[3]: *** Waiting for unfinished jobs....
  10. Fixes:
  11. - http://autobuild.buildroot.org/results/397f8098c57fc6c88aa12dc8d35ebb1b933d52ef
  12. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  13. [Upstream status:
  14. https://gitlab.freedesktop.org/xorg/xserver/merge_requests/173]
  15. ---
  16. hw/xwayland/Makefile.am | 6 +++++-
  17. 1 file changed, 5 insertions(+), 1 deletion(-)
  18. diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
  19. index bc1cb8506..502879e2a 100644
  20. --- a/hw/xwayland/Makefile.am
  21. +++ b/hw/xwayland/Makefile.am
  22. @@ -21,10 +21,14 @@ Xwayland_SOURCES = \
  23. $(top_srcdir)/Xi/stubs.c \
  24. $(top_srcdir)/mi/miinitext.c
  25. +if GLX
  26. +GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la
  27. +endif
  28. +
  29. Xwayland_LDADD = \
  30. $(glamor_lib) \
  31. $(XWAYLAND_LIBS) \
  32. - $(top_builddir)/glx/libglxvnd.la \
  33. + $(GLXVND_LIB) \
  34. $(XWAYLAND_SYS_LIBS) \
  35. $(top_builddir)/Xext/libXvidmode.la \
  36. $(XSERVER_SYS_LIBS)
  37. --
  38. 2.20.1