summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-06-02 13:27:49 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-06-09 12:22:39 +0000
commitc2f3a17f625cd2e9d4f91a26b4fe15c16dfc5557 (patch)
tree7dec8db72856cf23ffc5685eedb82f4d07c5ae50 /recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
parent8670ea2251244e0f7df27fe252b373b77ae4aa11 (diff)
downloadmeta-qt5-dev.tar.gz
qt5: update submodulesdev
Update to latest content in Qt 5.15 branch. Task-number: QTBUG-84150 Change-Id: I929553df6d0d32277d7e7c5bde2c242d811c29af Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
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.patch46
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 @@
1From ecaf6f335ed3b366ddb76a02c5a7246b5b5643d3 Mon Sep 17 00:00:00 2001 1From 636d6f4a3df2cf40f52b2245ed09719fdeda3444 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 12 Nov 2019 19:53:59 -0800 3Date: Tue, 12 Nov 2019 19:53:59 -0800
4Subject: [PATCH] mkspecs: Allow builds with libc != glibc 4Subject: [PATCH] mkspecs: Allow builds with libc != glibc
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 src/buildtools/config/support.pri | 5 ----- 8 src/buildtools/config/support.pri | 4 ----
9 1 file changed, 5 deletions(-) 9 src/buildtools/configure.json | 4 +---
10 2 files changed, 1 insertion(+), 7 deletions(-)
10 11
11diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri 12diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
12index 8077b12f..aaf4db47 100644 13index 6768f0a1..1885f1b4 100644
13--- a/src/buildtools/config/support.pri 14--- a/src/buildtools/config/support.pri
14+++ b/src/buildtools/config/support.pri 15+++ b/src/buildtools/config/support.pri
15@@ -97,11 +97,6 @@ defineTest(qtwebengine_checkErrorForLinux) { 16@@ -177,10 +177,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) {
16 return(false)
17 }
18 17
18 defineTest(qtwebengine_checkForGlibc) {
19 module = $$1
19- !qtConfig(webengine-system-glibc) { 20- !qtConfig(webengine-system-glibc) {
20- qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build QtWebEngine could not be found.") 21- qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.")
21- return(false) 22- return(false)
22- } 23- }
23- 24 return(true)
24 !qtConfig(webengine-system-khr) { 25 }
25 qtwebengine_skipBuild("Khronos development headers required to build QtWebEngine are missing (see mesa/libegl1-mesa-dev)") 26
26 return(false) 27diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
28index 96727a14..fef8fc5e 100644
29--- a/src/buildtools/configure.json
30+++ b/src/buildtools/configure.json
31@@ -371,7 +371,6 @@
32 && (!config.sanitizer || features.webengine-sanitizer)
33 && (!config.linux || features.pkg-config)
34 && (!config.linux || features.webengine-host-pkg-config)
35- && (!config.linux || features.webengine-system-glibc)
36 && (!config.linux || features.webengine-system-khr)
37 && (!config.linux || features.webengine-system-nss)
38 && (!config.linux || features.webengine-system-dbus)
39@@ -732,8 +731,7 @@
40 "webengine-system-fontconfig",
41 "webengine-system-dbus",
42 "webengine-system-nss",
43- "webengine-system-khr",
44- "webengine-system-glibc"
45+ "webengine-system-khr"
46 ]
47 },
48 {