diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch | 46 |
1 files changed, 34 insertions, 12 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 ef4855bb..63a775aa 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,26 +1,48 @@ -From ecaf6f335ed3b366ddb76a02c5a7246b5b5643d3 Mon Sep 17 00:00:00 2001 +From 636d6f4a3df2cf40f52b2245ed09719fdeda3444 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> --- - src/buildtools/config/support.pri | 5 ----- - 1 file changed, 5 deletions(-) + src/buildtools/config/support.pri | 4 ---- + src/buildtools/configure.json | 4 +--- + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri -index 8077b12f..aaf4db47 100644 +index 6768f0a1..1885f1b4 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri -@@ -97,11 +97,6 @@ defineTest(qtwebengine_checkErrorForLinux) { - return(false) - } +@@ -177,10 +177,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { + defineTest(qtwebengine_checkForGlibc) { + module = $$1 - !qtConfig(webengine-system-glibc) { -- qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.") +- qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.") - return(false) - } -- - !qtConfig(webengine-system-khr) { - qtwebengine_skipBuild("Khronos development headers required to build QtWebEngine are missing (see mesa/libegl1-mesa-dev)") - return(false) + return(true) + } + +diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json +index 96727a14..fef8fc5e 100644 +--- a/src/buildtools/configure.json ++++ b/src/buildtools/configure.json +@@ -371,7 +371,6 @@ + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) + && (!config.linux || features.webengine-host-pkg-config) +- && (!config.linux || features.webengine-system-glibc) + && (!config.linux || features.webengine-system-khr) + && (!config.linux || features.webengine-system-nss) + && (!config.linux || features.webengine-system-dbus) +@@ -732,8 +731,7 @@ + "webengine-system-fontconfig", + "webengine-system-dbus", + "webengine-system-nss", +- "webengine-system-khr", +- "webengine-system-glibc" ++ "webengine-system-khr" + ] + }, + { |