diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-04 08:25:55 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-04 08:31:38 +0300 |
commit | 0106f58f31df6b426dca2bb810fed5009d4cb28f (patch) | |
tree | a84de94177cb0c9ae65628d0875ebe90365a2254 /recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch | |
parent | e990651e683b47e60fc981dc4edb285a795ae490 (diff) | |
parent | 17fb7499c12764264212b1a28eb5782c741964d5 (diff) | |
download | meta-qt5-0106f58f31df6b426dca2bb810fed5009d4cb28f.tar.gz |
Merge remote-tracking branch 'qtyocto/5.13' into dev
* qtyocto/5.13: (46 commits)
qtwayland: update module
qt5: update submodules
qt5: update submodules
qt3d-runtime: update to v2.3
qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES
qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT
qtbase: add libxext dependency for xcb PACKAGECONFIG
python-pyqt5: Update to version 5.12.1.
python-pyqt: Fix annoying problems.
qtwebengine: arm: use OE specified -mcpu option
Revert "qtbase: Adjust target mkspec settings"
qtbase-tools: Fix error during pkg_postinst
qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm
qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
qtwayland: check also that the destination for private headers exists before installing them
qtwayland: improve manual header installation
qtwayland: workaround upstream bug: install missing headers manually
qtwayland: disable gold for all archs like in qtbase
qt5: upgrade to 5.12.3
qtbase: disable gold for all archs not just x86
...
Change-Id: I43d594b17bfeadc102a8817285c5834062e9cd75
Diffstat (limited to 'recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..a1d08236 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 703f89e35aaaec5ad781c222ae2dcd30f31320e9 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 30166fe41c..e06f75541b 100644 | ||
17 | --- a/src/corelib/global/qconfig-bootstrapped.h | ||
18 | +++ b/src/corelib/global/qconfig-bootstrapped.h | ||
19 | @@ -91,7 +91,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 | ||