summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-01-12 20:25:55 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-01-12 20:26:34 +0200
commit5b2109a88ee8e8a769190e640661434d98b62548 (patch)
tree13ec544f89bf10755025c683470a42f29f0f186d /recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
parente4e2acba9fe7e6c5903770b26ae374b74051d91c (diff)
parent25039161c1646ce1b6cc30303d4588e43b9b714a (diff)
downloadmeta-qt5-5b2109a88ee8e8a769190e640661434d98b62548.tar.gz
Merge remote-tracking branch 'qt/upstream/master' into 5.14
Notes: - Patch already present in 5.14 branch for qtwebengine musl build kept and upstream one (1a4ee018 qtwebengine: Fix musl build) discarded as that does not work with present content - Patch for time_t in qtbase (f6ad80f9 qtbase: Fix build on 32bit arches with 64bit time_t) is faulty, fixed in next commit * qt/upstream/master: 25039161 qtwebengine: Fix build with 64bit time_t on 32bit architectures 4f3ed3ed qtwebkit: add missing flex-native dep 456ec4ac qt5-creator, qtbase: Replace python with python3 f264e5dd qtdeclarative: Ask for python3 explicitly f6ad80f9 qtbase: Fix build on 32bit arches with 64bit time_t b7f4bd20 recipes: Use features_check instead of distro_features_check 1a4ee018 qtwebengine: Fix musl build 02715fff pyqt5: Upgrade to 5.13.2 Conflicts: recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtwebengine_git.bb Change-Id: I650cc667ede8f68f85164f52835b5e9f8db213f5
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.patch29
1 files changed, 29 insertions, 0 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
new file mode 100644
index 00000000..73ef469f
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
@@ -0,0 +1,29 @@
1From a5c8d833ffb8b54626b7b670b2782a6cf9a45075 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
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 mkspecs/features/configure.prf | 5 -----
9 1 file changed, 5 deletions(-)
10
11diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
12index cc84182b..c278ffae 100644
13--- a/mkspecs/features/configure.prf
14+++ b/mkspecs/features/configure.prf
15@@ -75,11 +75,6 @@ defineTest(runConfigure) {
16 return(false)
17 }
18
19- !qtConfig(webengine-system-glibc) {
20- skipBuild("A suitable version >= 2.27 of libc could not be found.")
21- return(false)
22- }
23-
24 QT_FOR_CONFIG += gui-private
25
26 !qtConfig(webengine-system-khr) {
27--
282.24.0
29