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/nativesdk-qtbase_git.bb | |
| 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/nativesdk-qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 8c3adae1..5ad6a650 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -24,7 +24,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" | |||
| 24 | 24 | ||
| 25 | # common for qtbase-native, qtbase-nativesdk and qtbase | 25 | # common for qtbase-native, qtbase-nativesdk and qtbase |
| 26 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared | 26 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared |
| 27 | # 5.11.meta-qt5-shared.6 | 27 | # 5.11.meta-qt5-shared.7 |
| 28 | SRC_URI += "\ | 28 | SRC_URI += "\ |
| 29 | file://0001-Add-linux-oe-g-platform.patch \ | 29 | file://0001-Add-linux-oe-g-platform.patch \ |
| 30 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 30 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
| @@ -39,13 +39,14 @@ SRC_URI += "\ | |||
| 39 | file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ | 39 | file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ |
| 40 | file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ | 40 | file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ |
| 41 | file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ | 41 | file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ |
| 42 | file://0014-Fix-qmake-build-with-glibc-2.28.patch \ | ||
| 42 | " | 43 | " |
| 43 | 44 | ||
| 44 | # common for qtbase-native and nativesdk-qtbase | 45 | # common for qtbase-native and nativesdk-qtbase |
| 45 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native | 46 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native |
| 46 | # 5.11.meta-qt5-native.6 | 47 | # 5.11.meta-qt5-native.7 |
| 47 | SRC_URI += " \ | 48 | SRC_URI += " \ |
| 48 | file://0014-Always-build-uic-and-qvkgen.patch \ | 49 | file://0015-Always-build-uic-and-qvkgen.patch \ |
| 49 | " | 50 | " |
| 50 | 51 | ||
| 51 | # CMake's toolchain configuration of nativesdk-qtbase | 52 | # CMake's toolchain configuration of nativesdk-qtbase |
