1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From addc1b0951db494fa42b141cf7e1c0f5d462e49a 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 | 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 e7f869a1..f9c9c24b 100644
--- a/src/buildtools/config/support.pri
+++ b/src/buildtools/config/support.pri
@@ -191,10 +191,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 $${module} could not be found.")
- return(false)
- }
return(true)
}
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index 812a91f9..a7c3d972 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -373,7 +373,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)
@@ -770,8 +769,7 @@
"webengine-system-fontconfig",
"webengine-system-dbus",
"webengine-system-nss",
- "webengine-system-khr",
- "webengine-system-glibc"
+ "webengine-system-khr"
]
},
{
|
