summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
index 6569ced8..c2eac846 100644
--- a/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
@@ -1,4 +1,4 @@
1From b52d58e204ffcb3dcd55ddee390d256cfbb1b54b Mon Sep 17 00:00:00 2001 1From a4099f31e1850c81a27ae3572b00705431b05254 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 12 Nov 2019 19:53:59 -0800 3Date: Tue, 12 Nov 2019 19:53:59 -0800
4Subject: [PATCH] mkspecs: Allow builds with libc != glibc 4Subject: [PATCH] mkspecs: Allow builds with libc != glibc
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 2 files changed, 1 insertion(+), 7 deletions(-) 10 2 files changed, 1 insertion(+), 7 deletions(-)
11 11
12diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri 12diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
13index e192f877..49ad4bf3 100644 13index e7f869a1..f9c9c24b 100644
14--- a/src/buildtools/config/support.pri 14--- a/src/buildtools/config/support.pri
15+++ b/src/buildtools/config/support.pri 15+++ b/src/buildtools/config/support.pri
16@@ -181,10 +181,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { 16@@ -191,10 +191,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) {
17 17
18 defineTest(qtwebengine_checkForGlibc) { 18 defineTest(qtwebengine_checkForGlibc) {
19 module = $$1 19 module = $$1
@@ -25,10 +25,10 @@ index e192f877..49ad4bf3 100644
25 } 25 }
26 26
27diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json 27diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
28index 1ca6214a..b352e675 100644 28index 812a91f9..a7c3d972 100644
29--- a/src/buildtools/configure.json 29--- a/src/buildtools/configure.json
30+++ b/src/buildtools/configure.json 30+++ b/src/buildtools/configure.json
31@@ -376,7 +376,6 @@ 31@@ -373,7 +373,6 @@
32 && (!config.sanitizer || features.webengine-sanitizer) 32 && (!config.sanitizer || features.webengine-sanitizer)
33 && (!config.linux || features.pkg-config) 33 && (!config.linux || features.pkg-config)
34 && (!config.linux || features.webengine-host-pkg-config) 34 && (!config.linux || features.webengine-host-pkg-config)
@@ -36,7 +36,7 @@ index 1ca6214a..b352e675 100644
36 && (!config.linux || features.webengine-system-khr) 36 && (!config.linux || features.webengine-system-khr)
37 && (!config.linux || features.webengine-system-nss) 37 && (!config.linux || features.webengine-system-nss)
38 && (!config.linux || features.webengine-system-dbus) 38 && (!config.linux || features.webengine-system-dbus)
39@@ -743,8 +742,7 @@ 39@@ -770,8 +769,7 @@
40 "webengine-system-fontconfig", 40 "webengine-system-fontconfig",
41 "webengine-system-dbus", 41 "webengine-system-dbus",
42 "webengine-system-nss", 42 "webengine-system-nss",