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) | |
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> --- configure | 2 +- mkspecs/features/configure.prf | 4 +-- - mkspecs/features/qt.prf | 6 ++-- mkspecs/features/qt_functions.prf | 2 +- mkspecs/linux-oe-g++/qmake.conf | 42 ++++++++++++++++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 1 + - 6 files changed, 50 insertions(+), 7 deletions(-) + 5 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h @@ -64,30 +63,6 @@ index 934a18a924..0f5b1b6333 100644 log("yes$$escape_expand(\\n)") msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) -diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index b57afcf72d..afa1c39b3e 100644 ---- a/mkspecs/features/qt.prf -+++ b/mkspecs/features/qt.prf -@@ -147,7 +147,7 @@ import_plugins:qtConfig(static) { - !isEmpty(plug_type) { - plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) - isEmpty(plug_path): \ -- plug_path = $$[QT_INSTALL_PLUGINS/get] -+ plug_path = $$[QT_INSTALL_PLUGINS] - LIBS += -L$$plug_path/$$plug_type - } - LIBS += -l$${plug}$$qtPlatformTargetSuffix() -@@ -298,8 +298,8 @@ for(ever) { - # static builds: link qml import plugins into the target. - contains(all_qt_module_deps, qml): \ - qtConfig(static):import_plugins:!host_build:!no_import_scan { -- exists($$[QT_INSTALL_QML/get]): \ -- QMLPATHS *= $$[QT_INSTALL_QML/get] -+ exists($$[QT_INSTALL_QML]): \ -+ QMLPATHS *= $$[QT_INSTALL_QML] - - # run qmlimportscanner - qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 1903e509c8..c093dd4592 100644 --- a/mkspecs/features/qt_functions.prf |