diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-15 10:19:24 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-01-15 10:20:17 +0200 |
commit | f29e5bf1d15372a21e3e79a23afbc2be9fbaa004 (patch) | |
tree | b2256fc1ebc713c8d51897eb46116b35d28551e9 /recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch | |
parent | 07393133a7c0c27c71a24da5ec09834281fd0f13 (diff) | |
parent | f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (diff) | |
download | meta-qt5-f29e5bf1d15372a21e3e79a23afbc2be9fbaa004.tar.gz |
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14:
f6ebff39 Merge remote-tracking branch 'qt/upstream/master' into 5.14
1b8e5570 qtbase: Use pcre packages by default
fd7ac089 qt5: use PACKAGECONFIG to disable tests and examples
1a7c8fa4 qtlocation: use geoclue 2
ddbf8dd0 qtbase: use offscreen platform plugin for tools
4f701ea1 qtbase: add openssl PACKAGECONFIG for native nativesdk
56b2c13d qtbase-native: disable vulkan support
6b34fd17 maliit-framework-qt5: fix test installations
aa50163c qtenginio: remove obsolete module
32edd746 ogl-runtime: update to v2.5.0 release
f7dcc706 qtquick3d: add recipe
b814111e qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
1fde17e1 qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
ca649e3f qt5: Update to Qt 5.14.0
ede15adc qtbase: Fix patch fuzz detected with devtool
e8221c2c qtbase: Backport the patch from upstream gerrit
ca2f53f9 qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
6e7cc682 qtwebengine: Move CharAllocator definition to header
33a86256 qt5-creator: Add missing dep on libz.so
3d47a569 qt5-creator: Make clang-format patch work with multiple clang versions
d8f0db7f qtwebengine: Include cstddef for size_t definition
b6bd407e qmllive: Fix build with multilib settings
69e1fd33 quazip: Fix multilib builds
a4db065b qtwebkit: Fix linking errors on clang/mips/ppc
f756a065 ogl-runtime: Only compile for supported architectures
710d995b qttools: Add option to disable qdoc
a02e01ca qttools: Use CONFIG+=disable_external_rpath
0d88f448 packagegroup-qt5-toolchain-target: Make machine specific
2a2055fa recipes: Disable clang dependent recipes for riscv64/32
Conflicts:
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
Change-Id: Ie1c25965f512eccade0a7518b3a2d23c6dc6b3c1
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 | ||