diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-08-09 12:37:03 +0000 |
---|---|---|
committer | Martin 'JaMa' Jansa <Martin.Jansa@gmail.com> | 2018-08-14 13:49:18 +0200 |
commit | 539e4f09f749f024d6e157a49559e5ad7f51470a (patch) | |
tree | c26a323be297bccc50cc21314973ebbfd3661c3e /recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |
parent | c2e4ec603be96cf2ede2557e459c39d25db25937 (diff) | |
download | meta-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/0001-Add-linux-oe-g-platform.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index f4dfe0b7..8f7afb6d 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |||
@@ -22,11 +22,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
22 | --- | 22 | --- |
23 | configure | 2 +- | 23 | configure | 2 +- |
24 | mkspecs/features/configure.prf | 4 +-- | 24 | mkspecs/features/configure.prf | 4 +-- |
25 | mkspecs/features/qt.prf | 6 ++-- | ||
26 | mkspecs/features/qt_functions.prf | 2 +- | 25 | mkspecs/features/qt_functions.prf | 2 +- |
27 | mkspecs/linux-oe-g++/qmake.conf | 42 ++++++++++++++++++++++++++++ | 26 | mkspecs/linux-oe-g++/qmake.conf | 42 ++++++++++++++++++++++++++++ |
28 | mkspecs/linux-oe-g++/qplatformdefs.h | 1 + | 27 | mkspecs/linux-oe-g++/qplatformdefs.h | 1 + |
29 | 6 files changed, 50 insertions(+), 7 deletions(-) | 28 | 5 files changed, 47 insertions(+), 4 deletions(-) |
30 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf | 29 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf |
31 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 30 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
32 | 31 | ||
@@ -64,30 +63,6 @@ index 934a18a924..0f5b1b6333 100644 | |||
64 | log("yes$$escape_expand(\\n)") | 63 | log("yes$$escape_expand(\\n)") |
65 | msg = "test $$1 succeeded" | 64 | msg = "test $$1 succeeded" |
66 | write_file($$QMAKE_CONFIG_LOG, msg, append) | 65 | write_file($$QMAKE_CONFIG_LOG, msg, append) |
67 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf | ||
68 | index b57afcf72d..afa1c39b3e 100644 | ||
69 | --- a/mkspecs/features/qt.prf | ||
70 | +++ b/mkspecs/features/qt.prf | ||
71 | @@ -147,7 +147,7 @@ import_plugins:qtConfig(static) { | ||
72 | !isEmpty(plug_type) { | ||
73 | plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) | ||
74 | isEmpty(plug_path): \ | ||
75 | - plug_path = $$[QT_INSTALL_PLUGINS/get] | ||
76 | + plug_path = $$[QT_INSTALL_PLUGINS] | ||
77 | LIBS += -L$$plug_path/$$plug_type | ||
78 | } | ||
79 | LIBS += -l$${plug}$$qtPlatformTargetSuffix() | ||
80 | @@ -298,8 +298,8 @@ for(ever) { | ||
81 | # static builds: link qml import plugins into the target. | ||
82 | contains(all_qt_module_deps, qml): \ | ||
83 | qtConfig(static):import_plugins:!host_build:!no_import_scan { | ||
84 | - exists($$[QT_INSTALL_QML/get]): \ | ||
85 | - QMLPATHS *= $$[QT_INSTALL_QML/get] | ||
86 | + exists($$[QT_INSTALL_QML]): \ | ||
87 | + QMLPATHS *= $$[QT_INSTALL_QML] | ||
88 | |||
89 | # run qmlimportscanner | ||
90 | qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) | ||
91 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 66 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
92 | index 1903e509c8..c093dd4592 100644 | 67 | index 1903e509c8..c093dd4592 100644 |
93 | --- a/mkspecs/features/qt_functions.prf | 68 | --- a/mkspecs/features/qt_functions.prf |