summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-08-09 12:37:03 +0000
committerMartin 'JaMa' Jansa <Martin.Jansa@gmail.com>2018-08-14 13:49:18 +0200
commit539e4f09f749f024d6e157a49559e5ad7f51470a (patch)
treec26a323be297bccc50cc21314973ebbfd3661c3e /recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch
parentc2e4ec603be96cf2ede2557e459c39d25db25937 (diff)
downloadmeta-qt5-539e4f09f749f024d6e157a49559e5ad7f51470a.tar.gz
qtbase: fix build with glibc-2.28
Fixes: qtbase/5.11.1+gitAUTOINC+74305ba470-r0/git/src/corelib/io/qfilesystemengine_unix.cpp:94: qtbase/5.11.1+gitAUTOINC+74305ba470-r0/recipe-sysroot/usr/include/linux/stat.h:56:8: error: redefinition of 'struct statx_timestamp' struct statx_timestamp { ^~~~~~~~~~~~~~~ qtbase/5.11.1+gitAUTOINC+74305ba470-r0/recipe-sysroot/usr/include/bits/statx.h:25:8: note: previous definition of 'struct statx_timestamp' struct statx_timestamp ^~~~~~~~~~~~~~~ You might encounter another error: qtbase/5.11.1+gitAUTOINC+74305ba470-r0/git/src/corelib/io/qfilesystemengine_unix.cpp:109:12: error: 'int renameat2(int, const char*, int, const char*, unsigned int)' was declared 'extern' and later 'static' [-fpermissive] static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newpath, unsigned flags) ^~~~~~~~~ qtbase/5.11.1+gitAUTOINC+74305ba470-r0/recipe-sysroot/usr/include/stdio.h:164:12: note: previous declaration of 'int renameat2(int, const char*, int, const char*, unsigned int)' extern int renameat2 (int __oldfd, const char *__old, int __newfd, ^~~~~~~~~ In that case enable renameat2 in your PACKAGECONFIG. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch
new file mode 100644
index 00000000..4f5fdc95
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch
@@ -0,0 +1,27 @@
1From 05bbd2dce8c7f4a40d86841671763b9d8b51c886 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 24 Nov 2017 15:16:31 +0200
4Subject: [PATCH] Bootstrap without linkat feature
5
6qmake does not work together with pseudo when unnamed temporary files
7are used with linkat.
8
9Upstream-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
15diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
16index c5585ea32a..de895e7bf4 100644
17--- a/src/corelib/global/qconfig-bootstrapped.h
18+++ b/src/corelib/global/qconfig-bootstrapped.h
19@@ -90,7 +90,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