diff options
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.patch | 12 |
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 6bd374d8..6569ced8 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 @@ -From 5994177219f97ac3eac35539b281c507dc65ed41 Mon Sep 17 00:00:00 2001 +From b52d58e204ffcb3dcd55ddee390d256cfbb1b54b 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 @@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri -index 6768f0a1..1885f1b4 100644 +index e192f877..49ad4bf3 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri -@@ -177,10 +177,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { +@@ -181,10 +181,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { defineTest(qtwebengine_checkForGlibc) { module = $$1 @@ -25,10 +25,10 @@ index 6768f0a1..1885f1b4 100644 } diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json -index 96727a14..fef8fc5e 100644 +index 1ca6214a..b352e675 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json -@@ -371,7 +371,6 @@ +@@ -376,7 +376,6 @@ && (!config.sanitizer || features.webengine-sanitizer) && (!config.linux || features.pkg-config) && (!config.linux || features.webengine-host-pkg-config) @@ -36,7 +36,7 @@ index 96727a14..fef8fc5e 100644 && (!config.linux || features.webengine-system-khr) && (!config.linux || features.webengine-system-nss) && (!config.linux || features.webengine-system-dbus) -@@ -732,8 +731,7 @@ +@@ -743,8 +742,7 @@ "webengine-system-fontconfig", "webengine-system-dbus", "webengine-system-nss", |