| 1 | Qt checks if glibc is available and if not disables large part of Qt5WebEngine and thus cripples functionality.
|
| 2 | However these parts work fine with Musl so there is no need to disable them.
|
| 3 | Just remove the check so it builds again. Since 5.15.1 is the last version of Qt to be released with this build system it'll be obsolete with Qt6 and there is no real point in fixing this upstream.
|
| 4 |
|
| 5 |
|
| 6 | diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
|
| 7 | index e7f869a1..de18523d 100644
|
| 8 | |
| 9 | |
| 10 | @@ -189,15 +189,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) {
|
| 11 | return(true)
|
| 12 | }
|
| 13 |
|
| 14 | -defineTest(qtwebengine_checkForGlibc) {
|
| 15 | - module = $$1
|
| 16 | - !qtConfig(webengine-system-glibc) {
|
| 17 | - qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.")
|
| 18 | - return(false)
|
| 19 | - }
|
| 20 | - return(true)
|
| 21 | -}
|
| 22 | -
|
| 23 | defineTest(qtwebengine_checkForKhronos) {
|
| 24 | module = $$1
|
| 25 | !qtConfig(webengine-system-khr) {
|
| 26 | diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
|
| 27 | index 88d1790c..8623f6d7 100644
|
| 28 | |
| 29 | |
| 30 | @@ -264,18 +264,6 @@
|
| 31 | "label": "system gn",
|
| 32 | "type": "detectGn"
|
| 33 | },
|
| 34 | - "webengine-glibc": {
|
| 35 | - "label": "glibc > 2.16",
|
| 36 | - "type": "compile",
|
| 37 | - "test": {
|
| 38 | - "include": "features.h",
|
| 39 | - "tail": [
|
| 40 | - "#if __GLIBC__ < 2 || __GLIBC_MINOR__ < 17",
|
| 41 | - "#error glibc versions below 2.17 are not supported",
|
| 42 | - "#endif"
|
| 43 | - ]
|
| 44 | - }
|
| 45 | - },
|
| 46 | "webengine-gperf": {
|
| 47 | "label": "gperf",
|
| 48 | "type": "detectGperf"
|
| 49 | @@ -379,7 +367,6 @@
|
| 50 | && (!config.sanitizer || features.webengine-sanitizer)
|
| 51 | && (!config.linux || features.pkg-config)
|
| 52 | && (!config.linux || features.webengine-host-pkg-config)
|
| 53 | - && (!config.linux || features.webengine-system-glibc)
|
| 54 | && (!config.linux || features.webengine-system-khr)
|
| 55 | && (!config.linux || features.webengine-system-nss)
|
| 56 | && (!config.linux || features.webengine-system-dbus)
|
| 57 | @@ -517,11 +504,6 @@
|
| 58 | "condition": "config.unix && !config.darwin && libs.webengine-nss",
|
| 59 | "output": [ "privateFeature" ]
|
| 60 | },
|
| 61 | - "webengine-system-glibc": {
|
| 62 | - "label": "glibc",
|
| 63 | - "condition": "config.linux && tests.webengine-glibc",
|
| 64 | - "output": [ "privateFeature" ]
|
| 65 | - },
|
| 66 | "webengine-system-x11" : {
|
| 67 | "label": "x11",
|
| 68 | "condition": "config.unix && libs.webengine-x11",
|
| 69 | @@ -782,8 +764,7 @@
|
| 70 | "webengine-system-fontconfig",
|
| 71 | "webengine-system-dbus",
|
| 72 | "webengine-system-nss",
|
| 73 | - "webengine-system-khr",
|
| 74 | - "webengine-system-glibc"
|
| 75 | + "webengine-system-khr"
|
| 76 | ]
|
| 77 | },
|
| 78 | {
|