diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:42:26 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:57:32 +0200 |
commit | f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch) | |
tree | d0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch | |
parent | 9ff0a36249205d36bb44cc34a26cb6201180a89f (diff) | |
parent | 1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff) | |
download | meta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz |
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits)
qtbase: Use pcre packages by default
qt5: use PACKAGECONFIG to disable tests and examples
qtlocation: use geoclue 2
qtbase: use offscreen platform plugin for tools
qtbase: add openssl PACKAGECONFIG for native nativesdk
qtbase-native: disable vulkan support
maliit-framework-qt5: fix test installations
qtenginio: remove obsolete module
ogl-runtime: update to v2.5.0 release
qtquick3d: add recipe
qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qt5: Update to Qt 5.14.0
qtbase: Fix patch fuzz detected with devtool
qtbase: Backport the patch from upstream gerrit
qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
qtwebengine: Move CharAllocator definition to header
qt5-creator: Add missing dep on libz.so
qt5-creator: Make clang-format patch work with multiple clang versions
qtwebengine: Include cstddef for size_t definition
...
Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
Diffstat (limited to 'recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..70f25ca2 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 7596905dbe3ff36a129b5793966da30579d877f4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Fri, 24 Nov 2017 15:16:31 +0200 | ||
4 | Subject: [PATCH] Bootstrap without linkat feature | ||
5 | |||
6 | qmake does not work together with pseudo when unnamed temporary files | ||
7 | are used with linkat. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific] | ||
10 | [YOCTO #11996] | ||
11 | --- | ||
12 | src/corelib/global/qconfig-bootstrapped.h | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h | ||
16 | index 283ce1ce26..dfcbb15a6b 100644 | ||
17 | --- a/src/corelib/global/qconfig-bootstrapped.h | ||
18 | +++ b/src/corelib/global/qconfig-bootstrapped.h | ||
19 | @@ -95,7 +95,7 @@ | ||
20 | #define QT_FEATURE_itemmodel -1 | ||
21 | #define QT_FEATURE_library -1 | ||
22 | #ifdef __linux__ | ||
23 | -# define QT_FEATURE_linkat 1 | ||
24 | +# define QT_FEATURE_linkat -1 | ||
25 | #else | ||
26 | # define QT_FEATURE_linkat -1 | ||
27 | #endif | ||