diff options
Diffstat (limited to 'recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch')
-rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch deleted file mode 100644 index 48f271ae..00000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 836f93de99b35050d78d61d3654f7c5655184144 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Fri, 19 Apr 2019 10:19:50 +0200 -Subject: [PATCH] hw/xwayland/Makefile.am: fix build without glx - -Commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b added libglxvnd.la to -Xwayland_LDFLAGS but GLX can be disabled through --disable-glx. -In this case, build fails on: - -make[3]: *** No rule to make target '../../glx/libglxvnd.la', needed by 'Xwayland'. Stop. -make[3]: *** Waiting for unfinished jobs.... - -Fixes: - - http://autobuild.buildroot.org/results/397f8098c57fc6c88aa12dc8d35ebb1b933d52ef - -Upstream-Status: Backport [836f93de99b35050d78d61d3654f7c5655184144] -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - hw/xwayland/Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am -index bc1cb8506..502879e2a 100644 ---- a/hw/xwayland/Makefile.am -+++ b/hw/xwayland/Makefile.am -@@ -21,10 +21,14 @@ Xwayland_SOURCES = \ - $(top_srcdir)/Xi/stubs.c \ - $(top_srcdir)/mi/miinitext.c - -+if GLX -+GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la -+endif -+ - Xwayland_LDADD = \ - $(glamor_lib) \ - $(XWAYLAND_LIBS) \ -- $(top_builddir)/glx/libglxvnd.la \ -+ $(GLXVND_LIB) \ - $(XWAYLAND_SYS_LIBS) \ - $(top_builddir)/Xext/libXvidmode.la \ - $(XSERVER_SYS_LIBS) --- -2.17.1 - |