diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-16 09:15:31 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-16 10:35:31 +0300 |
commit | b9313110bd4ec9a30a037f2edd78b02bf57ed6eb (patch) | |
tree | eaf467a73585a6a4971d87324897bc21d771c5ab /recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch | |
parent | 0fb09cabc2499f52113630dacbea7524402e7793 (diff) | |
parent | f6bae656fa1b8e7ec28ecac5bf0ac70d63abd1b5 (diff) | |
download | meta-qt5-b9313110bd4ec9a30a037f2edd78b02bf57ed6eb.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
* origin/5.13: (22 commits)
qt5-creator: fix bad merge
qtbase: use offscreen platform plugin for tools
coin: update poky and openembedded revisions
qtwebengine: allow build for musl libc
qt5: update submodules
qt5: update to Qt 5.12.5
Add CI build instructions
qt5-creator: fix build with musl
ogl-runtime: fix build on musl libc
qtdeclarative: Use qmlcachegen provided by OE instead of system one.
qtbase-native: Always use qt provided doubleconversion library.
qttools: Enable clang support when using clang
qt5-creator: update to v4.9.2
maliit-framework-qt5: Fix build when ptest is enabled
qtwebengine: Fix build on aarch64
qtwebengine: refresh the patches to apply
qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc
qt5: Upgrade to Qt 5.13.0
Allow enabling gui for native and nativesdk
qt5everywheredemo: update HOMEPAGE
...
Change-Id: I59c8da38833c99e3f8f24f09d04a48c9df79bbf5
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch b/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch new file mode 100644 index 00000000..3047230c --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0004-musl-allow-build-without-glibc.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | From a1c248259f3d8561d6e2c75a56edf4a72c393843 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Thu, 15 Aug 2019 07:52:53 +0300 | ||
4 | Subject: [PATCH] musl: allow build without glibc | ||
5 | |||
6 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | ||
7 | --- | ||
8 | mkspecs/features/configure.prf | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf | ||
12 | index cc84182b..f1310f75 100644 | ||
13 | --- a/mkspecs/features/configure.prf | ||
14 | +++ b/mkspecs/features/configure.prf | ||
15 | @@ -75,7 +75,7 @@ defineTest(runConfigure) { | ||
16 | return(false) | ||
17 | } | ||
18 | |||
19 | - !qtConfig(webengine-system-glibc) { | ||
20 | + false:!qtConfig(webengine-system-glibc) { | ||
21 | skipBuild("A suitable version >= 2.27 of libc could not be found.") | ||
22 | return(false) | ||
23 | } | ||