summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-04-29 11:23:25 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2021-05-10 12:49:06 +0200
commit72772ba86f43610557d86b2d7af38776213b1aec (patch)
tree03178ff53826d25297c85a12856e4fd68e32d78f /recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch
parentc92031e3729d778f0b52d98f6cd6def87139c7b7 (diff)
downloadmeta-qt5-72772ba86f43610557d86b2d7af38776213b1aec.tar.gz
qtwebengine: lower MODULE_VERSION to 5.15.2
* as we cannot upgrade all modules past 5.15.2 due to license change and the branches for 5.15.4 not available publicly, but qtwebengine and the chromium bits which are probably most important for security fixes are available and hopefully we can use them for non-commercial use Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch
new file mode 100644
index 00000000..9e0050dc
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch
@@ -0,0 +1,48 @@
1From addc1b0951db494fa42b141cf7e1c0f5d462e49a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 12 Nov 2019 19:53:59 -0800
4Subject: [PATCH] mkspecs: Allow builds with libc != glibc
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 src/buildtools/config/support.pri | 4 ----
9 src/buildtools/configure.json | 4 +---
10 2 files changed, 1 insertion(+), 7 deletions(-)
11
12diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
13index e7f869a1..f9c9c24b 100644
14--- a/src/buildtools/config/support.pri
15+++ b/src/buildtools/config/support.pri
16@@ -191,10 +191,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) {
17
18 defineTest(qtwebengine_checkForGlibc) {
19 module = $$1
20- !qtConfig(webengine-system-glibc) {
21- qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.")
22- return(false)
23- }
24 return(true)
25 }
26
27diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
28index 812a91f9..a7c3d972 100644
29--- a/src/buildtools/configure.json
30+++ b/src/buildtools/configure.json
31@@ -373,7 +373,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@@ -770,8 +769,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 {