1From 0ffba1b9cba1421c3751b2f20ba84fca356911fb 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 6Upstream-Status: Pending 7Signed-off-by: Khem Raj <raj.khem@gmail.com> 8--- 9 src/buildtools/config/support.pri | 4 ---- 10 src/buildtools/configure.json | 4 +--- 11 2 files changed, 1 insertion(+), 7 deletions(-) 12 13diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri 14index e7f869a15..f9c9c24bf 100644 15--- a/src/buildtools/config/support.pri 16+++ b/src/buildtools/config/support.pri 17@@ -191,10 +191,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { 18 19 defineTest(qtwebengine_checkForGlibc) { 20 module = $$1 21- !qtConfig(webengine-system-glibc) { 22- qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.") 23- return(false) 24- } 25 return(true) 26 } 27 28diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json 29index 88d1790c1..9eb5e8e33 100644 30--- a/src/buildtools/configure.json 31+++ b/src/buildtools/configure.json 32@@ -379,7 +379,6 @@ 33 && (!config.sanitizer || features.webengine-sanitizer) 34 && (!config.linux || features.pkg-config) 35 && (!config.linux || features.webengine-host-pkg-config) 36- && (!config.linux || features.webengine-system-glibc) 37 && (!config.linux || features.webengine-system-khr) 38 && (!config.linux || features.webengine-system-nss) 39 && (!config.linux || features.webengine-system-dbus) 40@@ -782,8 +781,7 @@ 41 "webengine-system-fontconfig", 42 "webengine-system-dbus", 43 "webengine-system-nss", 44- "webengine-system-khr", 45- "webengine-system-glibc" 46+ "webengine-system-khr" 47 ] 48 }, 49 { 50