[Buildroot] [git commit] Revert "qt5webkit: fix build issue with mesa3d w/out xcb"
Arnout Vandecappelle (Essensium/Mind)
arnout at mind.be
Sun Apr 1 21:48:30 UTC 2018
commit: https://git.buildroot.net/buildroot/commit/?id=3f52e9d584b573ac0b4e582e07b9b371215bffc5
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
This reverts commit e46f9fde78e53740bd00c077275d3cd80d7792c7.
Supersede by:
qt5base: fix build issue with mesa3d w/out xcb
Signed-off-by: Gaël PORTAY <gael.portay at savoirfairelinux.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
package/qt5/qt5webkit/qt5webkit.mk | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 5186671663..e8d368fb01 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -44,15 +44,8 @@ define QT5WEBKIT_PYTHON2_SYMLINK
endef
QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
-# The mesa's EGL/eglplatform.h header includes X11 headers unless the flag
-# MESA_EGL_NO_X11_HEADERS is defined. Tell to not include X11 headers if
-# the libxcb is not selected.
-ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)x$(BR2_PACKAGE_LIBXCB),yx)
-QT5WEBKIT_QMAKEFLAGS += QMAKE_CXXFLAGS+=-DMESA_EGL_NO_X11_HEADERS
-endif
-
define QT5WEBKIT_CONFIGURE_CMDS
- (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake $(QT5WEBKIT_QMAKEFLAGS))
+ (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake)
endef
define QT5WEBKIT_BUILD_CMDS
More information about the buildroot
mailing list