diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-02-21 20:29:39 -0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-26 16:51:55 +0000 |
| commit | a5aadb7a92558ea33833a189cc6b6fd1019c2a5b (patch) | |
| tree | 451fc316765d3ef3bab8848602cb634e0cae0205 | |
| parent | 6f9d4fdf99ea5c1ac1b0c9c9b637961b2c032195 (diff) | |
qtbase: Replace -isystem with -I
Fixes no-x11 builds (eglfs)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 1 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase/0014-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch | 36 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 1 |
3 files changed, 38 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 20e24ebe..5fa24d37 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -34,6 +34,7 @@ SRC_URI += "\ file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ + file://0014-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ " # common for qtbase-native and nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase/0014-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0014-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch new file mode 100644 index 00000000..44e90097 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0014-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch @@ -0,0 +1,36 @@ +From 61c858474804fd772d612e6c5b4bb6df261d521a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 14 Feb 2018 17:08:43 -0800 +Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem + +-isystem fails to build when code uses include_next on certain files e.g. + +qtbase/5.10.0+gitAUTOINC+50117d738a-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory + #include_next <stdlib.h> + ^~~~~~~~~~ +compilation terminated. +make[2]: *** [Makefile:11592: .obj/qgenericpluginfactory.o] Error 1 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + mkspecs/common/gcc-base.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf +index 234f71d495..ee3da023e6 100644 +--- a/mkspecs/common/gcc-base.conf ++++ b/mkspecs/common/gcc-base.conf +@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g + QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC + QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC + QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC +-QMAKE_CFLAGS_ISYSTEM = -isystem ++QMAKE_CFLAGS_ISYSTEM = -I + QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden + QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions +-- +2.16.1 + diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4df7a767..a8be52d7 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -30,6 +30,7 @@ SRC_URI += "\ file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ + file://0014-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ " # LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp |