Apparently pkg-config is not used for qt configuration, so we need to
provide MESA_EGL_NO_X11_HEADERS in case mesa is built without X11 headers,
e.g. wayland only. Otherwise the following error orccurs:
make[7]: Entering directory '/build/build-target/qt-everywhere-opensource
-src-5.6.1-1-build/qtbase/src/plugins/platforms/eglfs'
compiling /build/build-target/qt-everywhere-opensource-src-5.6.1-1/qtbase/
src/plugins/platforms/eglfs/qeglfsmain.cpp
In file included from /build/sysroot-target/usr/include/EGL/egl.h:39:0,
from /build/build-target/qt-everywhere-opensource-src
-5.6.1-1/qtbase/src/plugins/platforms/eglfs/qeglfsintegration.h:41,
from /build/build-target/qt-everywhere-opensource-src
-5.6.1-1/qtbase/src/plugins/platforms/eglfs/qeglfsmain.cpp:35:
/build/sysroot-target/usr/include/EGL/eglplatform.h:119:22:
fatal error: X11/Xlib.h: No such file or directory
compilation terminated.
Signed-off-by: Alexander Stein <[email protected]>
---
rules/qt5.make | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rules/qt5.make b/rules/qt5.make
index b802443..3a91cbb 100644
--- a/rules/qt5.make
+++ b/rules/qt5.make
@@ -222,6 +222,10 @@ QT5_CONF_OPT += \
--$(call ptx/endis, PTXCONF_QT5_XRENDER)-xrender \
--$(call ptx/endis, PTXCONF_QT5_XV)-xvideo \
+ifndef PTXCONF_XORG_LIB_X11
+QT5_CONF_OPT += -DMESA_EGL_NO_X11_HEADERS
+endif
+
ifdef PTXCONF_QT5_MODULE_QTBASE_SQL_MYSQL
QT5_CONF_OPT += -mysql_config $(SYSROOT)/usr/bin/mysql_config
endif
--
2.7.3
_______________________________________________
ptxdist mailing list
[email protected]
