diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-09-24 03:24:19 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-25 09:50:40 +0000 |
| commit | d0cd7a7a70d3fe3b3041d41391c5c082d8f23a0d (patch) | |
| tree | 727231310f8a41b47e8c5697f33df0266c8ce9a2 /recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch | |
| parent | 81239229dfda6d9a4b72dc44245fdfb9f10e6fcb (diff) | |
qtbase: Fix errors due to -isystem
empty out QMAKE_CFLAGS_ISYSTEM this will ensure that -isystem is not
used instead it will use -I to include internal QT headers
Dont hardcode QMAKE_DEFAULT_INCDIRS when cross compile
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch index d636c633..8b7f1425 100644 --- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch +++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch @@ -1,4 +1,4 @@ -From 18d57dc5c7946f06f087031be259b9b8922f4691 Mon Sep 17 00:00:00 2001 +From 4cd70420175107d3d707b66735729f3668a447df 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 @@ -15,11 +15,26 @@ 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(-) + mkspecs/common/clang.conf | 2 +- + mkspecs/common/gcc-base.conf | 2 +- + mkspecs/features/toolchain.prf | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) +diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf +index 0fb84bc1b3..68b49b5303 100644 +--- a/mkspecs/common/clang.conf ++++ b/mkspecs/common/clang.conf +@@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX + CONFIG += clang_pch_style + QMAKE_PCH_OUTPUT_EXT = .pch + +-QMAKE_CFLAGS_ISYSTEM = -isystem ++QMAKE_CFLAGS_ISYSTEM = + QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} + QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} + QMAKE_CFLAGS_LTCG = -flto diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf -index 234f71d495..ee3da023e6 100644 +index 234f71d495..c7d81a902e 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g @@ -27,7 +42,22 @@ index 234f71d495..ee3da023e6 100644 QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC -QMAKE_CFLAGS_ISYSTEM = -isystem -+QMAKE_CFLAGS_ISYSTEM = -I ++QMAKE_CFLAGS_ISYSTEM = QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions +diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf +index fdf3d1cdd3..fb5413736f 100644 +--- a/mkspecs/features/toolchain.prf ++++ b/mkspecs/features/toolchain.prf +@@ -152,8 +152,8 @@ isEmpty($${target_prefix}.INCDIRS) { + } + + unix { +- isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include +- isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib ++ isEmpty(QMAKE_DEFAULT_INCDIRS) & !cross_compile: QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include ++ isEmpty(QMAKE_DEFAULT_LIBDIRS) & !cross_compile: QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib + } + + cache($${target_prefix}.INCDIRS, set stash, QMAKE_DEFAULT_INCDIRS) |