1*4882a593SmuzhiyunFrom 0ffba1b9cba1421c3751b2f20ba84fca356911fb Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Tue, 12 Nov 2019 19:53:59 -0800 4*4882a593SmuzhiyunSubject: [PATCH] mkspecs: Allow builds with libc != glibc 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUpstream-Status: Pending 7*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 8*4882a593Smuzhiyun--- 9*4882a593Smuzhiyun src/buildtools/config/support.pri | 4 ---- 10*4882a593Smuzhiyun src/buildtools/configure.json | 4 +--- 11*4882a593Smuzhiyun 2 files changed, 1 insertion(+), 7 deletions(-) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri 14*4882a593Smuzhiyunindex e7f869a15..f9c9c24bf 100644 15*4882a593Smuzhiyun--- a/src/buildtools/config/support.pri 16*4882a593Smuzhiyun+++ b/src/buildtools/config/support.pri 17*4882a593Smuzhiyun@@ -191,10 +191,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { 18*4882a593Smuzhiyun 19*4882a593Smuzhiyun defineTest(qtwebengine_checkForGlibc) { 20*4882a593Smuzhiyun module = $$1 21*4882a593Smuzhiyun- !qtConfig(webengine-system-glibc) { 22*4882a593Smuzhiyun- qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.") 23*4882a593Smuzhiyun- return(false) 24*4882a593Smuzhiyun- } 25*4882a593Smuzhiyun return(true) 26*4882a593Smuzhiyun } 27*4882a593Smuzhiyun 28*4882a593Smuzhiyundiff --git a/src/buildtools/configure.json b/src/buildtools/configure.json 29*4882a593Smuzhiyunindex 88d1790c1..9eb5e8e33 100644 30*4882a593Smuzhiyun--- a/src/buildtools/configure.json 31*4882a593Smuzhiyun+++ b/src/buildtools/configure.json 32*4882a593Smuzhiyun@@ -379,7 +379,6 @@ 33*4882a593Smuzhiyun && (!config.sanitizer || features.webengine-sanitizer) 34*4882a593Smuzhiyun && (!config.linux || features.pkg-config) 35*4882a593Smuzhiyun && (!config.linux || features.webengine-host-pkg-config) 36*4882a593Smuzhiyun- && (!config.linux || features.webengine-system-glibc) 37*4882a593Smuzhiyun && (!config.linux || features.webengine-system-khr) 38*4882a593Smuzhiyun && (!config.linux || features.webengine-system-nss) 39*4882a593Smuzhiyun && (!config.linux || features.webengine-system-dbus) 40*4882a593Smuzhiyun@@ -782,8 +781,7 @@ 41*4882a593Smuzhiyun "webengine-system-fontconfig", 42*4882a593Smuzhiyun "webengine-system-dbus", 43*4882a593Smuzhiyun "webengine-system-nss", 44*4882a593Smuzhiyun- "webengine-system-khr", 45*4882a593Smuzhiyun- "webengine-system-glibc" 46*4882a593Smuzhiyun+ "webengine-system-khr" 47*4882a593Smuzhiyun ] 48*4882a593Smuzhiyun }, 49*4882a593Smuzhiyun { 50