diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-22 14:15:12 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-26 16:53:07 +0000 |
| commit | 1d9fbb1576846318e6f842006bf8c27758f094fb (patch) | |
| tree | 772f2b404ce6bb3c7c06bd381ccc72aa3efa741e /recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch | |
| parent | a5aadb7a92558ea33833a189cc6b6fd1019c2a5b (diff) | |
| download | meta-qt5-1d9fbb1576846318e6f842006bf8c27758f094fb.tar.gz | |
qt5: refresh patches from meta-qt5/qt* repos
* apply:
0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
also for nativesdk-qtbase as the comment says
* drop unused:
0001-Add-missing-include-for-struct-timeval.patch
which wasn't removed in 5.10.1 upgrade
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..c733c156 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | From 77365eda4dd1c4c26803b3f0d1f411b7416ad531 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 dabb715..5b4ff86 100644 | ||
| 17 | --- a/src/corelib/global/qconfig-bootstrapped.h | ||
| 18 | +++ b/src/corelib/global/qconfig-bootstrapped.h | ||
| 19 | @@ -88,7 +88,7 @@ | ||
| 20 | #define QT_FEATURE_futimes -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 | ||
