[oe] [meta-qt5][PATCH] qtbase: Replace -isystem with -I

Denys Dmytriyenko denis at denix.org
Thu Feb 15 23:41:52 UTC 2018


On Wed, Feb 14, 2018 at 08:38:48PM -0800, Khem Raj wrote:
> Fixes no-x11 builds (eglfs)
> 
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
>  recipes-qt/qt5/qtbase-native_git.bb                |  1 +
>  ...mon-gcc-base.conf-Use-I-instead-of-isyste.patch | 36 ++++++++++++++++++++++
>  recipes-qt/qt5/qtbase_git.bb                       |  1 +
>  3 files changed, 38 insertions(+)
>  create mode 100644 recipes-qt/qt5/qtbase/0014-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
> 
> diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
> index ac3924e..ffde8ee 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 0000000..44e9009
> --- /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 at 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>
> +               ^~~~~~~~~~

I'm building qt 5.10.0 in master with gcc 7.3.0 in a no-x11 environment with 
eglfs and not seeing this issue. What else is different?


> +compilation terminated.
> +make[2]: *** [Makefile:11592: .obj/qgenericpluginfactory.o] Error 1
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Khem Raj <raj.khem at 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 4f3ade2..cc9bce3 100644
> --- a/recipes-qt/qt5/qtbase_git.bb
> +++ b/recipes-qt/qt5/qtbase_git.bb
> @@ -29,6 +29,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 \
>      file://run-ptest \
>  "
>  
> -- 
> 2.16.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel



More information about the Openembedded-devel mailing list