1 files changed, 16 insertions, 19 deletions

diff --git a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
index 73ef469f..5c3eafb5 100644
--- a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
@@ -1,29 +1,26 @@
-From a5c8d833ffb8b54626b7b670b2782a6cf9a45075 Mon Sep 17 00:00:00 2001
+From 71d55292cdd72dcf1ed5eb4ba7299433a35a4bb0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 12 Nov 2019 19:53:59 -0800
 Subject: [PATCH] mkspecs: Allow builds with libc != glibc
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- mkspecs/features/configure.prf | 5 -----
+ src/buildtools/config/support.pri | 5 -----
  1 file changed, 5 deletions(-)
 
-diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
-index cc84182b..c278ffae 100644
---- a/mkspecs/features/configure.prf
-+++ b/mkspecs/features/configure.prf
-@@ -75,11 +75,6 @@ defineTest(runConfigure) {
-             return(false)
-         }
+diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
+index 5bdd808d..19540787 100644
+--- a/src/buildtools/config/support.pri
++++ b/src/buildtools/config/support.pri
+@@ -89,11 +89,6 @@ defineTest(qtwebengine_checkErrorForLinux) {
+         return(false)
+     }
  
--        !qtConfig(webengine-system-glibc) {
--            skipBuild("A suitable version >= 2.27 of libc could not be found.")
--            return(false)
--        }
+-    !qtConfig(webengine-system-glibc) {
+-        qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.")
+-        return(false)
+-    }
 -
-         QT_FOR_CONFIG += gui-private
- 
-         !qtConfig(webengine-system-khr) {
--- 
-2.24.0
-
+     !qtConfig(webengine-system-khr) {
+         qtwebengine_skipBuild("Khronos development headers required to build QtWebEngine are missing (see mesa/libegl1-mesa-dev)")
+         return(false)