From f9e80edff01159375b6e03f3cb9ea1f8ed5ced79 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 Sep 2018 08:37:18 +0000 Subject: qt5: update to latest revision in 5.11 branch * drop nobranch=1 again * update the branches and tags on meta-qt5/qt* forks and the tag name in recipes * use latest revision in 5.11 branch instead of 5.11.2 which might be removed again Signed-off-by: Martin Jansa --- .../0017-Bootstrap-without-linkat-feature.patch | 27 ---------------------- 1 file changed, 27 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch (limited to 'recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch') diff --git a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch deleted file mode 100644 index 4f5fdc95..00000000 --- a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 05bbd2dce8c7f4a40d86841671763b9d8b51c886 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 24 Nov 2017 15:16:31 +0200 -Subject: [PATCH] Bootstrap without linkat feature - -qmake does not work together with pseudo when unnamed temporary files -are used with linkat. - -Upstream-Status: Inappropriate [OE specific] -[YOCTO #11996] ---- - src/corelib/global/qconfig-bootstrapped.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index c5585ea32a..de895e7bf4 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -90,7 +90,7 @@ - #define QT_FEATURE_itemmodel -1 - #define QT_FEATURE_library -1 - #ifdef __linux__ --# define QT_FEATURE_linkat 1 -+# define QT_FEATURE_linkat -1 - #else - # define QT_FEATURE_linkat -1 - #endif -- cgit v1.2.3-54-g00ecf From 81239229dfda6d9a4b72dc44245fdfb9f10e6fcb Mon Sep 17 00:00:00 2001 From: Lei Maohui Date: Thu, 30 Aug 2018 10:58:18 +0900 Subject: qtbase: Fix build error for armv8BE multilib. * MJ: modified to apply correctly and to be included in native and nativesdk builds as the comment above SRC_URI says. Signed-off-by: Lei Maohui Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 7 ++-- recipes-qt/qt5/qtbase-native_git.bb | 9 ++--- .../qtbase/0015-Always-build-uic-and-qvkgen.patch | 28 --------------- ...e-conversion-support-AARCH64EB-and-arm-BE.patch | 40 ++++++++++++++++++++++ .../qtbase/0016-Always-build-uic-and-qvkgen.patch | 28 +++++++++++++++ .../0016-Bootstrap-without-linkat-feature.patch | 27 --------------- .../0017-Bootstrap-without-linkat-feature.patch | 27 +++++++++++++++ recipes-qt/qt5/qtbase_git.bb | 3 +- 8 files changed, 106 insertions(+), 63 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch create mode 100644 recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch create mode 100644 recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch delete mode 100644 recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch create mode 100644 recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch (limited to 'recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index caa2d6ab..ac16e5d8 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.8 +# 5.11.meta-qt5-shared.9 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -39,13 +39,14 @@ SRC_URI += "\ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ + file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.8 +# 5.11.meta-qt5-native.9 SRC_URI += " \ - file://0015-Always-build-uic-and-qvkgen.patch \ + file://0016-Always-build-uic-and-qvkgen.patch \ " # CMake's toolchain configuration of nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index a01d19d9..25d0963c 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.8 +# 5.11.meta-qt5-shared.9 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -34,18 +34,19 @@ SRC_URI += "\ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ + file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native -# 5.11.meta-qt5-native.8 +# 5.11.meta-qt5-native.9 SRC_URI += " \ - file://0015-Always-build-uic-and-qvkgen.patch \ + file://0016-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0016-Bootstrap-without-linkat-feature.patch \ + file://0017-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" diff --git a/recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch deleted file mode 100644 index e021d0b1..00000000 --- a/recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e590966ce7344a79e6ff0593076fdca5b3ec72c8 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH] Always build uic and qvkgen - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index 1c76a2e46f..fbd4014fb3 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -232,7 +232,7 @@ qtConfig(gui) { - } - } - } --SUBDIRS += src_plugins -+SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen - - nacl: SUBDIRS -= src_network src_testlib - diff --git a/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch b/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch new file mode 100644 index 00000000..64e454a2 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch @@ -0,0 +1,40 @@ +From 3aada36f6706f86b811dafb26e622cd6c99341d6 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Wed, 29 Aug 2018 18:20:14 +0900 +Subject: [PATCH] double-conversion: support AARCH64EB and arm BE + +Big endian can work well. So, +- Make qtbase support aarch64 BE +- Make qtbase support arm BE + +Upstream-Status: Pending + +Change-Id: Ie5b104fa2b23af8e89bae57fb56f3663be1bbb48 +Signed-off-by: Lei Maohui +Signed-off-by: Martin Jansa +--- + .../double-conversion/include/double-conversion/utils.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h +index ca7646d817..69aa17171c 100644 +--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h ++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h +@@ -68,7 +68,7 @@ inline void abort_noreturn() { abort(); } + // disabled.) + // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) + #if defined(_M_X64) || defined(__x86_64__) || \ +- defined(__ARMEL__) || defined(__avr32__) || _M_ARM_FP || \ ++ defined(__arm__) || defined(__avr32__) || _M_ARM_FP || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ +@@ -76,7 +76,7 @@ inline void abort_noreturn() { abort(); } + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ +- defined(__AARCH64EL__) || defined(__aarch64__) || \ ++ defined(__AARCH64EL__) || defined(__AARCH64EB__) || defined(__aarch64__) || \ + defined(__riscv) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) diff --git a/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch new file mode 100644 index 00000000..dfef2508 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch @@ -0,0 +1,28 @@ +From c6edfce8778d1497383124d5a9ed9cb7b9edb1d4 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 16 Nov 2013 00:32:30 +0100 +Subject: [PATCH] Always build uic and qvkgen + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 1c76a2e46f..fbd4014fb3 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -232,7 +232,7 @@ qtConfig(gui) { + } + } + } +-SUBDIRS += src_plugins ++SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen + + nacl: SUBDIRS -= src_network src_testlib + diff --git a/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch deleted file mode 100644 index 7c6787fb..00000000 --- a/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ee9048d24045e2f39a4236557d9247c1cad993a5 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 24 Nov 2017 15:16:31 +0200 -Subject: [PATCH] Bootstrap without linkat feature - -qmake does not work together with pseudo when unnamed temporary files -are used with linkat. - -Upstream-Status: Inappropriate [OE specific] -[YOCTO #11996] ---- - src/corelib/global/qconfig-bootstrapped.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index c5585ea32a..de895e7bf4 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -90,7 +90,7 @@ - #define QT_FEATURE_itemmodel -1 - #define QT_FEATURE_library -1 - #ifdef __linux__ --# define QT_FEATURE_linkat 1 -+# define QT_FEATURE_linkat -1 - #else - # define QT_FEATURE_linkat -1 - #endif diff --git a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..c191a421 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch @@ -0,0 +1,27 @@ +From 365b1b7059d333331a208418b66e9107dc2a4fcc Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 24 Nov 2017 15:16:31 +0200 +Subject: [PATCH] Bootstrap without linkat feature + +qmake does not work together with pseudo when unnamed temporary files +are used with linkat. + +Upstream-Status: Inappropriate [OE specific] +[YOCTO #11996] +--- + src/corelib/global/qconfig-bootstrapped.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index c5585ea32a..de895e7bf4 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -90,7 +90,7 @@ + #define QT_FEATURE_itemmodel -1 + #define QT_FEATURE_library -1 + #ifdef __linux__ +-# define QT_FEATURE_linkat 1 ++# define QT_FEATURE_linkat -1 + #else + # define QT_FEATURE_linkat -1 + #endif diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 1142097b..72fa2301 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.8 +# 5.11.meta-qt5-shared.9 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -30,6 +30,7 @@ SRC_URI += "\ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ + file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ " -- cgit v1.2.3-54-g00ecf From d0cd7a7a70d3fe3b3041d41391c5c082d8f23a0d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 24 Sep 2018 03:24:19 -0700 Subject: 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 Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 4 +-- recipes-qt/qt5/qtbase-native_git.bb | 4 +-- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 6 ++-- ...make-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch | 2 +- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 2 +- ...ump-path-length-from-256-to-512-character.patch | 2 +- ...-unknown-features-instead-of-erroring-out.patch | 2 +- ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch | 2 +- .../0007-Delete-qlonglong-and-qulonglong.patch | 2 +- ...08-Replace-pthread_yield-with-sched_yield.patch | 2 +- ...-Add-OE-specific-specs-for-clang-compiler.patch | 6 ++-- ...-Invert-conditional-for-defining-QT_SOCKL.patch | 2 +- ..._qlocale-Enable-QT_USE_FENV-only-on-glibc.patch | 2 +- ...mon-gcc-base.conf-Use-I-instead-of-isyste.patch | 40 +++++++++++++++++++--- .../0013-Upgrade-double-conversion-to-v3.0.0.patch | 2 +- ...-version-for-renameat2-statx-on-non-boots.patch | 2 +- ...e-conversion-support-AARCH64EB-and-arm-BE.patch | 2 +- .../qtbase/0016-Always-build-uic-and-qvkgen.patch | 2 +- .../0017-Bootstrap-without-linkat-feature.patch | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 20 files changed, 60 insertions(+), 30 deletions(-) (limited to 'recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index ac16e5d8..5eab04d0 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.9 +# 5.11.meta-qt5-shared.10 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -44,7 +44,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.9 +# 5.11.meta-qt5-native.10 SRC_URI += " \ file://0016-Always-build-uic-and-qvkgen.patch \ " diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 25d0963c..d3c2b239 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.9 +# 5.11.meta-qt5-shared.10 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -39,7 +39,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native -# 5.11.meta-qt5-native.9 +# 5.11.meta-qt5-native.10 SRC_URI += " \ file://0016-Always-build-uic-and-qvkgen.patch \ " 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 a793ab49..acb0a7d4 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 @@ -1,4 +1,4 @@ -From 4c54d7c45a47a9a63530e821468f7bc76dd78f77 Mon Sep 17 00:00:00 2001 +From a6f4987a281315dacc7b8b55928b9c0793cd0813 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -103,7 +103,7 @@ index 1903e509c8..c093dd4592 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000000..d90dfeb448 +index 0000000000..f34a66599a --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,40 @@ @@ -139,7 +139,7 @@ index 0000000000..d90dfeb448 +QMAKE_LINK_SHLIB = $$(OE_QMAKE_LINK) +QMAKE_LINK_C = $$(OE_QMAKE_LINK) +QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK) -+ ++QMAKE_CFLAGS_ISYSTEM = +# for the SDK +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG) + diff --git a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch index 477aa470..3e266ff4 100644 --- a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch +++ b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch @@ -1,4 +1,4 @@ -From 34692222faebb1345a1830c4f0d25adee10161ab Mon Sep 17 00:00:00 2001 +From 2409068a4a7f51f12122629ed6ba043d872a6ff6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index c3ee8ee9..4e5b02e6 100644 --- a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,4 +1,4 @@ -From 74aefb4f9841ab99eea7d817babad4b01e44c6c8 Mon Sep 17 00:00:00 2001 +From 6d828cb28acc5b3fccc8ccc45b600c0f7c20201f Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch index 185f27f0..2ed169f9 100644 --- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch @@ -1,4 +1,4 @@ -From 40d61921f44c6f52a44f6efce0439a42f5186e1f Mon Sep 17 00:00:00 2001 +From d10cf6bb2b0c4637bd0df07c559fcdd461379b4d Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 25 Aug 2015 10:05:15 -0400 Subject: [PATCH] configure: bump path length from 256 to 512 characters diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch index c49a2fe8..0414af4e 100644 --- a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch +++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch @@ -1,4 +1,4 @@ -From 458e2b0192ec1b4b2add05aa7554302f598a9470 Mon Sep 17 00:00:00 2001 +From fc51c10426c68137c57b5ea6c7ea2bdfe0055aaf Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 24 Oct 2016 09:45:18 +0300 Subject: [PATCH] Disable all unknown features instead of erroring out diff --git a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch index eb1fddc7..e2e31e86 100644 --- a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +++ b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch @@ -1,4 +1,4 @@ -From 3450dba78d488d76cb4827ebfe0c8eda8d1517ca Mon Sep 17 00:00:00 2001 +From f13bad486f825f88ec7757e1c5d2dbc849d9797a Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 11 May 2016 15:20:41 +0200 Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS diff --git a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch index c4d1fd5b..9b8f0096 100644 --- a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch +++ b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch @@ -1,4 +1,4 @@ -From b4088245535393a75ebf6747acd281f6b9187e12 Mon Sep 17 00:00:00 2001 +From 7fc8b8c15007e0a1687680c66292d8ed55000053 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Wed, 7 Jun 2017 21:00:49 +0900 Subject: [PATCH] Delete qlonglong and qulonglong diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch index 3011f5f2..6fac905d 100644 --- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch +++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch @@ -1,4 +1,4 @@ -From f3f00676d204b56010d80a1373ad18abe80d455a Mon Sep 17 00:00:00 2001 +From 83965aee0017fb424406d895af5ec2cec696f26c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 27 Jul 2017 08:02:51 -0700 Subject: [PATCH] Replace pthread_yield with sched_yield diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch index c5586852..ca74f0f7 100644 --- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch +++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch @@ -1,4 +1,4 @@ -From 563e954aaa4cf82560f157af79344c4b7cb7ca6d Mon Sep 17 00:00:00 2001 +From 51bc56305205a154db22c1373eb19d835ba2c64e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 09:11:44 -0700 Subject: [PATCH] Add OE specific specs for clang compiler @@ -13,7 +13,7 @@ Signed-off-by: Khem Raj diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf new file mode 100644 -index 0000000000..ffc9f051db +index 0000000000..b0a5630fdd --- /dev/null +++ b/mkspecs/linux-oe-clang/qmake.conf @@ -0,0 +1,43 @@ @@ -52,7 +52,7 @@ index 0000000000..ffc9f051db +QMAKE_LINK_SHLIB = $$(OE_QMAKE_LINK) +QMAKE_LINK_C = $$(OE_QMAKE_LINK) +QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK) -+ ++QMAKE_CFLAGS_ISYSTEM = +# for the SDK +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG) + diff --git a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch index 7dbce146..ff7dceed 100644 --- a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch +++ b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch @@ -1,4 +1,4 @@ -From 7dff9f4506d9d0e3059d0016de748ea2074e19aa Mon Sep 17 00:00:00 2001 +From f5d4eed2a82b327130f3301ea5f8e56169df3dcf Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 09:44:48 -0700 Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch index 04e8a0a3..1864ab8f 100644 --- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch +++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch @@ -1,4 +1,4 @@ -From 5e108991e3f781026a71be241ba7d0c5b06ac655 Mon Sep 17 00:00:00 2001 +From 5cbe22a0f46ab9bcdc5ff8d293ce925d94e951fd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 10:11:50 -0700 Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc 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 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 --- - 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) diff --git a/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch b/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch index bc7f0cb7..c6f2f098 100644 --- a/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch +++ b/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch @@ -1,4 +1,4 @@ -From 1f0101170508a11618ed444d3691cb5369daf7e5 Mon Sep 17 00:00:00 2001 +From 70ea08d861a30b82dc4fa7f2c8dfd62f43a4f365 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 27 Apr 2018 10:38:18 +0200 Subject: [PATCH] Upgrade double-conversion to v3.0.0 diff --git a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch index 673e8fd9..d47a38ff 100644 --- a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch +++ b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch @@ -1,4 +1,4 @@ -From 067dd79223c12e40930e612964a77066393a4131 Mon Sep 17 00:00:00 2001 +From 21cb4725d17fa2f491da8e1cd228d74d9d890292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 21 Aug 2018 00:29:06 +0200 Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped diff --git a/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch b/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch index 64e454a2..8ee3a57f 100644 --- a/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch +++ b/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch @@ -1,4 +1,4 @@ -From 3aada36f6706f86b811dafb26e622cd6c99341d6 Mon Sep 17 00:00:00 2001 +From bd82e15fc5d9d5cecade652c8854f33aa71212dd Mon Sep 17 00:00:00 2001 From: Lei Maohui Date: Wed, 29 Aug 2018 18:20:14 +0900 Subject: [PATCH] double-conversion: support AARCH64EB and arm BE diff --git a/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch index dfef2508..81ac4f59 100644 --- a/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From c6edfce8778d1497383124d5a9ed9cb7b9edb1d4 Mon Sep 17 00:00:00 2001 +From 87df95f5ecf85d0053ddc0aa045bbdcd1c6d40e8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen diff --git a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch index c191a421..353de485 100644 --- a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From 365b1b7059d333331a208418b66e9107dc2a4fcc Mon Sep 17 00:00:00 2001 +From dafd3b158d62313cad5217c99036322ea86cc24a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 72fa2301..9a5f4024 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.9 +# 5.11.meta-qt5-shared.10 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ -- cgit v1.2.3-54-g00ecf From 24d6fc29ab806daadb5e4aa93b768b3cc76c2fc4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 25 Sep 2018 12:27:07 -0700 Subject: qtbase: Do not use cross_compile check This check is not accepted by qmake resulting in subsequent failures in qtwebengine Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 4 ++-- recipes-qt/qt5/qtbase-native_git.bb | 6 ++--- ...mon-gcc-base.conf-Use-I-instead-of-isyste.patch | 26 +++++----------------- .../0013-Upgrade-double-conversion-to-v3.0.0.patch | 2 +- ...-version-for-renameat2-statx-on-non-boots.patch | 2 +- ...e-conversion-support-AARCH64EB-and-arm-BE.patch | 2 +- .../qtbase/0016-Always-build-uic-and-qvkgen.patch | 2 +- .../0017-Bootstrap-without-linkat-feature.patch | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 9 files changed, 17 insertions(+), 31 deletions(-) (limited to 'recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 5eab04d0..02ee6077 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.10 +# 5.11.meta-qt5-shared.11 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -44,7 +44,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.10 +# 5.11.meta-qt5-native.11 SRC_URI += " \ file://0016-Always-build-uic-and-qvkgen.patch \ " diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index d3c2b239..d4709013 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.10 +# 5.11.meta-qt5-shared.11 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -38,8 +38,8 @@ SRC_URI += "\ " # common for qtbase-native and nativesdk-qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native -# 5.11.meta-qt5-native.10 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native +# 5.11.meta-qt5-native.11 SRC_URI += " \ file://0016-Always-build-uic-and-qvkgen.patch \ " 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 8b7f1425..68d29346 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 4cd70420175107d3d707b66735729f3668a447df Mon Sep 17 00:00:00 2001 +From 9048b31285d643c52b4461bca646c91f1a5729d1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 14 Feb 2018 17:08:43 -0800 Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem @@ -13,12 +13,13 @@ make[2]: *** [Makefile:11592: .obj/qgenericpluginfactory.o] Error 1 Upstream-Status: Pending +Change-Id: Ia47832a6339a6ee59c0a6301fc5e552cd28b1029 Signed-off-by: Khem Raj +Signed-off-by: Martin Jansa --- - mkspecs/common/clang.conf | 2 +- - mkspecs/common/gcc-base.conf | 2 +- - mkspecs/features/toolchain.prf | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) + mkspecs/common/clang.conf | 2 +- + mkspecs/common/gcc-base.conf | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf index 0fb84bc1b3..68b49b5303 100644 @@ -46,18 +47,3 @@ index 234f71d495..c7d81a902e 100644 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) diff --git a/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch b/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch index c6f2f098..c8240448 100644 --- a/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch +++ b/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch @@ -1,4 +1,4 @@ -From 70ea08d861a30b82dc4fa7f2c8dfd62f43a4f365 Mon Sep 17 00:00:00 2001 +From d701e6ba0eccfb4d0e31cc33cf420020fbc870d1 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 27 Apr 2018 10:38:18 +0200 Subject: [PATCH] Upgrade double-conversion to v3.0.0 diff --git a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch index d47a38ff..0f1e1b30 100644 --- a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch +++ b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch @@ -1,4 +1,4 @@ -From 21cb4725d17fa2f491da8e1cd228d74d9d890292 Mon Sep 17 00:00:00 2001 +From f63242fbcac990839eff2ce9f970377d6350fd8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 21 Aug 2018 00:29:06 +0200 Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped diff --git a/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch b/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch index 8ee3a57f..091fa812 100644 --- a/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch +++ b/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch @@ -1,4 +1,4 @@ -From bd82e15fc5d9d5cecade652c8854f33aa71212dd Mon Sep 17 00:00:00 2001 +From 8fa67276c9cfb0002d5f4077f70ce2f477edbc4d Mon Sep 17 00:00:00 2001 From: Lei Maohui Date: Wed, 29 Aug 2018 18:20:14 +0900 Subject: [PATCH] double-conversion: support AARCH64EB and arm BE diff --git a/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch index 81ac4f59..732e2fb7 100644 --- a/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From 87df95f5ecf85d0053ddc0aa045bbdcd1c6d40e8 Mon Sep 17 00:00:00 2001 +From 7b5433027e9c75902b83a2990e09ae221d98451e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen diff --git a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch index 353de485..66dc8404 100644 --- a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From dafd3b158d62313cad5217c99036322ea86cc24a Mon Sep 17 00:00:00 2001 +From 739dd4920bc16919c81c62bcddadc6958599792c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 9a5f4024..6bf42643 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.10 +# 5.11.meta-qt5-shared.11 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ -- cgit v1.2.3-54-g00ecf