Mesa (master): wayland-egl: adds CFLAGS for wayland.egl.h include

Emil Velikov evelikov at kemper.freedesktop.org
Wed Oct 4 13:46:40 UTC 2017


Module: Mesa
Branch: master
Commit: 80bfff5c4f1d4d8c842a0ae06440d7886e8c2f28
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=80bfff5c4f1d4d8c842a0ae06440d7886e8c2f28

Author: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
Date:   Tue Oct  3 15:45:22 2017 +0200

wayland-egl: adds CFLAGS for wayland.egl.h include

Starting with commit ab0589c6ed ("wayland-egl: remove no longer needed
wayland-client dependency") the wayland-egl.h include was missing leading to a
build failure:

  CC       wayland-egl.lo
wayland-egl.c:33:10: fatal error: wayland-egl.h: No such file or directory
 #include "wayland-egl.h"
          ^~~~~~~~~~~~~~~

Strictly speaking we should be checking for wayland-egl in configure and
propagating its CFLAGS here.

Yet again, the current wayland-egl split is bonkers as the Wayland repo
provides single header, no pkg-config file or library.

That will be resolved at a later stage, but in the meanwhile fix the
build.

Fixes: ab0589c6ed ("wayland-egl: remove no longer needed wayland-client
dependency")
Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
[Emil Velikov: add some text about CFLAGS and current wayland-egl situation]
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/egl/wayland/wayland-egl/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/egl/wayland/wayland-egl/Makefile.am b/src/egl/wayland/wayland-egl/Makefile.am
index 08a6768049..730fd03ddb 100644
--- a/src/egl/wayland/wayland-egl/Makefile.am
+++ b/src/egl/wayland/wayland-egl/Makefile.am
@@ -2,7 +2,8 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = wayland-egl.pc
 
 AM_CFLAGS = $(DEFINES) \
-	    $(VISIBILITY_CFLAGS)
+	    $(VISIBILITY_CFLAGS) \
+	    $(WAYLAND_SERVER_CFLAGS)
 
 lib_LTLIBRARIES = libwayland-egl.la
 noinst_HEADERS = wayland-egl-backend.h




More information about the mesa-commit mailing list