From 1520d5b2b2beec5e1c3209d3178219e93ef08bca Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 14 Apr 2019 13:59:30 +0200 Subject: qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recently pseudo changed to not support reanameeat2 as glibc wrapper [1]. This causes massive failures at do_install [2] on qtbase. To work around tell Qt build configuration not to use ranameat2 independent of glibc version. Target qtbase does not require this adjustment - there is no pseudo on target. [1] https://git.openembedded.org/openembedded-core/commit/?id=0fb257121b68f38b40c078150db8f7d0979b7ea5 [2] https://github.com/meta-qt5/meta-qt5/issues/187 Signed-off-by: Andreas Müller --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 20 +++---- recipes-qt/qt5/qtbase-native_git.bb | 20 +++---- ...-version-for-renameat2-statx-on-non-boots.patch | 38 ------------ ...e-conversion-support-AARCH64EB-and-arm-BE.patch | 40 +++++++++++++ .../qtbase/0015-Disable-ltcg-for-host_build.patch | 26 +++++++++ ...e-conversion-support-AARCH64EB-and-arm-BE.patch | 40 ------------- .../qtbase/0016-Disable-ltcg-for-host_build.patch | 26 --------- ...gExtras.cmake.in-cope-with-variable-path-.patch | 66 +++++++++++++++++++++ ...gExtras.cmake.in-cope-with-variable-path-.patch | 66 --------------------- ...-corelib-Include-sys-types.h-for-uint32_t.patch | 27 +++++++++ ...KE_CXX.COMPILER_MACROS-for-clang-on-linux.patch | 41 +++++++++++++ ...-corelib-Include-sys-types.h-for-uint32_t.patch | 27 --------- ...KE_CXX.COMPILER_MACROS-for-clang-on-linux.patch | 41 ------------- .../qtbase/0019-Fix-compile-issue-with-gcc-9.patch | 31 ++++++++++ .../qtbase/0020-Always-build-uic-and-qvkgen.patch | 28 +++++++++ .../qtbase/0020-Fix-compile-issue-with-gcc-9.patch | 31 ---------- .../qtbase/0021-Always-build-uic-and-qvkgen.patch | 28 --------- ...21-Avoid-renameeat2-for-native-sdk-builds.patch | 67 ++++++++++++++++++++++ .../0022-Bootstrap-without-linkat-feature.patch | 4 +- recipes-qt/qt5/qtbase_git.bb | 15 +++-- 20 files changed, 355 insertions(+), 327 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch create mode 100644 recipes-qt/qt5/qtbase/0014-double-conversion-support-AARCH64EB-and-arm-BE.patch create mode 100644 recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch delete mode 100644 recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch delete mode 100644 recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch create mode 100644 recipes-qt/qt5/qtbase/0016-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch delete mode 100644 recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch create mode 100644 recipes-qt/qt5/qtbase/0017-corelib-Include-sys-types.h-for-uint32_t.patch create mode 100644 recipes-qt/qt5/qtbase/0018-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch delete mode 100644 recipes-qt/qt5/qtbase/0018-corelib-Include-sys-types.h-for-uint32_t.patch delete mode 100644 recipes-qt/qt5/qtbase/0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch create mode 100644 recipes-qt/qt5/qtbase/0019-Fix-compile-issue-with-gcc-9.patch create mode 100644 recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch delete mode 100644 recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch delete mode 100644 recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch create mode 100644 recipes-qt/qt5/qtbase/0021-Avoid-renameeat2-for-native-sdk-builds.patch diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index bfce14f5..477417e0 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.13 +# 5.11.meta-qt5-shared.14 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -38,20 +38,20 @@ SRC_URI += "\ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 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 \ - file://0016-Disable-ltcg-for-host_build.patch \ - file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ - file://0018-corelib-Include-sys-types.h-for-uint32_t.patch \ - file://0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0020-Fix-compile-issue-with-gcc-9.patch \ + file://0014-double-conversion-support-AARCH64EB-and-arm-BE.patch \ + file://0015-Disable-ltcg-for-host_build.patch \ + file://0016-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ + file://0017-corelib-Include-sys-types.h-for-uint32_t.patch \ + file://0018-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0019-Fix-compile-issue-with-gcc-9.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.13 +# 5.11.meta-qt5-native.14 SRC_URI += " \ - file://0021-Always-build-uic-and-qvkgen.patch \ + file://0020-Always-build-uic-and-qvkgen.patch \ + file://0021-Avoid-renameeat2-for-native-sdk-builds.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 ed5226b9..cc537b5b 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.13 +# 5.11.meta-qt5-shared.14 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -33,20 +33,20 @@ SRC_URI += "\ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 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 \ - file://0016-Disable-ltcg-for-host_build.patch \ - file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ - file://0018-corelib-Include-sys-types.h-for-uint32_t.patch \ - file://0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0020-Fix-compile-issue-with-gcc-9.patch \ + file://0014-double-conversion-support-AARCH64EB-and-arm-BE.patch \ + file://0015-Disable-ltcg-for-host_build.patch \ + file://0016-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ + file://0017-corelib-Include-sys-types.h-for-uint32_t.patch \ + file://0018-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0019-Fix-compile-issue-with-gcc-9.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.13 +# 5.11.meta-qt5-native.14 SRC_URI += " \ - file://0021-Always-build-uic-and-qvkgen.patch \ + file://0020-Always-build-uic-and-qvkgen.patch \ + file://0021-Avoid-renameeat2-for-native-sdk-builds.patch \ " # only for qtbase-native 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 deleted file mode 100644 index 09ec0fa9..00000000 --- a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fb6a20e6917cfa32e69791e0adb130140f4b5688 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 - build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - src/corelib/io/qfilesystemengine_unix.cpp | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index 964dcebeb2..c09eb0154b 100644 ---- a/src/corelib/io/qfilesystemengine_unix.cpp -+++ b/src/corelib/io/qfilesystemengine_unix.cpp -@@ -95,6 +95,17 @@ extern "C" NSString *NSTemporaryDirectory(); - #ifndef FICLONE - # define FICLONE _IOW(0x94, 9, int) - #endif -+ -+// renameat2/statx features for non bootstrapped build -+#ifndef QT_BOOTSTRAPPED -+#ifdef __GLIBC_PREREQ -+# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+#else -+# define QT_FEATURE_renameat2 -1 -+# define QT_FEATURE_statx -1 -+#endif -+#endif - #endif - - #if defined(Q_OS_ANDROID) diff --git a/recipes-qt/qt5/qtbase/0014-double-conversion-support-AARCH64EB-and-arm-BE.patch b/recipes-qt/qt5/qtbase/0014-double-conversion-support-AARCH64EB-and-arm-BE.patch new file mode 100644 index 00000000..5212f7dd --- /dev/null +++ b/recipes-qt/qt5/qtbase/0014-double-conversion-support-AARCH64EB-and-arm-BE.patch @@ -0,0 +1,40 @@ +From 7959088cb80f27202252f7080a4c334f3474cac7 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/0015-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch new file mode 100644 index 00000000..7248b878 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch @@ -0,0 +1,26 @@ +From 8b71f94e010aa9ee0c1e577738e0a8af8365b39e Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Tue, 23 Oct 2018 09:54:57 +0300 +Subject: [PATCH] Disable ltcg for host_build + +debug-prefix-map does not work correctly for static libraries +when using ltcg, and since host_build compilations link agaist +the libQt5Bootstrap.a library, it breaks source file packaging +into debug packages. + +Task-number: QTBUG-71230 +Upstream-Status: Inappropriate [embedded specific] +--- + mkspecs/features/ltcg.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf +index ccf0226272..482e5b573d 100644 +--- a/mkspecs/features/ltcg.prf ++++ b/mkspecs/features/ltcg.prf +@@ -1,4 +1,4 @@ +-CONFIG(release, debug|release) { ++CONFIG(release, debug|release):!host_build { + # We need fat object files when creating static libraries on some platforms + # so the linker will know to load a particular object from the library + # in the first place. On others, we have special ar and nm to create the symbol 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 deleted file mode 100644 index 5658b01a..00000000 --- a/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 09b304966543753e445b90b904a9f558377a87f6 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-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch deleted file mode 100644 index e6ba5a35..00000000 --- a/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e9ea14a04e74be6740b82d51340bb6218f35ab1f Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Tue, 23 Oct 2018 09:54:57 +0300 -Subject: [PATCH] Disable ltcg for host_build - -debug-prefix-map does not work correctly for static libraries -when using ltcg, and since host_build compilations link agaist -the libQt5Bootstrap.a library, it breaks source file packaging -into debug packages. - -Task-number: QTBUG-71230 -Upstream-Status: Inappropriate [embedded specific] ---- - mkspecs/features/ltcg.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf -index ccf0226272..482e5b573d 100644 ---- a/mkspecs/features/ltcg.prf -+++ b/mkspecs/features/ltcg.prf -@@ -1,4 +1,4 @@ --CONFIG(release, debug|release) { -+CONFIG(release, debug|release):!host_build { - # We need fat object files when creating static libraries on some platforms - # so the linker will know to load a particular object from the library - # in the first place. On others, we have special ar and nm to create the symbol diff --git a/recipes-qt/qt5/qtbase/0016-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0016-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch new file mode 100644 index 00000000..921ca25f --- /dev/null +++ b/recipes-qt/qt5/qtbase/0016-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch @@ -0,0 +1,66 @@ +From bf8555d48d2402e7ed60f1f4232270d24623e088 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +Date: Sat, 27 Oct 2018 12:29:31 +0000 +Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to + sysroot + +EGL is configured to need an include path into the recipe-specific sysroot. +However users of the cmake file will have a different absolute path than that +used when creating the cmake file from cmake.in in qtbase. + +Change to store the relative path within the sysroot and then prepend the +currently used sysroot in the _qt5gui_find_extra_libs macro. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Max Krummenacher +--- + src/gui/Qt5GuiConfigExtras.cmake.in | 22 ++++++++-------------- + 1 file changed, 8 insertions(+), 14 deletions(-) + +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 07869efd7d..671aa82167 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) + + macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) + set(Qt5Gui_${Name}_LIBRARIES) +-!!IF !mac +- set(Qt5Gui_${Name}_INCLUDE_DIRS ${IncDirs}) +-!!ELSE ++ + foreach(_dir ${IncDirs}) +- if (EXISTS ${_dir}) +- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_dir}) +- else() +- find_path(_actual_dir ${_dir}) # Look in sdk directories +- if (_actual_dir) +- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir}) +- endif() +- unset(_actual_dir CACHE) ++ find_path(_actual_dir ${_dir}) ++ if (_actual_dir) ++ list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir}) + endif() ++ unset(_actual_dir CACHE) + endforeach() +-!!ENDIF ++ + foreach(_lib ${Libs}) + string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_lib}) + if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE) +@@ -158,11 +152,11 @@ endmacro() + + + !!IF !isEmpty(CMAKE_EGL_LIBS) +-_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$CMAKE_EGL_INCDIRS\") ++_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$replace(CMAKE_EGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\") + !!ENDIF + + !!IF !isEmpty(CMAKE_OPENGL_LIBS) +-_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$CMAKE_OPENGL_INCDIRS\") ++_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$replace(CMAKE_OPENGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\") + + !!ENDIF + diff --git a/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch deleted file mode 100644 index 54b0f640..00000000 --- a/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ /dev/null @@ -1,66 +0,0 @@ -From f5b11bb3ab6299912491568f84185e0174cc6e5a Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Sat, 27 Oct 2018 12:29:31 +0000 -Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to - sysroot - -EGL is configured to need an include path into the recipe-specific sysroot. -However users of the cmake file will have a different absolute path than that -used when creating the cmake file from cmake.in in qtbase. - -Change to store the relative path within the sysroot and then prepend the -currently used sysroot in the _qt5gui_find_extra_libs macro. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Max Krummenacher ---- - src/gui/Qt5GuiConfigExtras.cmake.in | 22 ++++++++-------------- - 1 file changed, 8 insertions(+), 14 deletions(-) - -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..671aa82167 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) - - macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) - set(Qt5Gui_${Name}_LIBRARIES) --!!IF !mac -- set(Qt5Gui_${Name}_INCLUDE_DIRS ${IncDirs}) --!!ELSE -+ - foreach(_dir ${IncDirs}) -- if (EXISTS ${_dir}) -- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_dir}) -- else() -- find_path(_actual_dir ${_dir}) # Look in sdk directories -- if (_actual_dir) -- list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir}) -- endif() -- unset(_actual_dir CACHE) -+ find_path(_actual_dir ${_dir}) -+ if (_actual_dir) -+ list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir}) - endif() -+ unset(_actual_dir CACHE) - endforeach() --!!ENDIF -+ - foreach(_lib ${Libs}) - string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_lib}) - if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE) -@@ -158,11 +152,11 @@ endmacro() - - - !!IF !isEmpty(CMAKE_EGL_LIBS) --_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$CMAKE_EGL_INCDIRS\") -+_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$replace(CMAKE_EGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\") - !!ENDIF - - !!IF !isEmpty(CMAKE_OPENGL_LIBS) --_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$CMAKE_OPENGL_INCDIRS\") -+_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$replace(CMAKE_OPENGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\") - - !!ENDIF - diff --git a/recipes-qt/qt5/qtbase/0017-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0017-corelib-Include-sys-types.h-for-uint32_t.patch new file mode 100644 index 00000000..8ee4c30d --- /dev/null +++ b/recipes-qt/qt5/qtbase/0017-corelib-Include-sys-types.h-for-uint32_t.patch @@ -0,0 +1,27 @@ +From 206fb0ffdcbd2ae2278f37d8cfe5c16301312c58 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 6 Dec 2018 11:47:52 -0800 +Subject: [PATCH] corelib: Include sys/types.h for uint32_t + +This has been includes indirectly on glibc/linux systems +via inttypes.h -> stdint.h -> sys/types.h but it breaks on +musl where this indirect include chain does not exist. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/corelib/global/qnumeric_p.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h +index 5f8a124bcc..fe1711cf1b 100644 +--- a/src/corelib/global/qnumeric_p.h ++++ b/src/corelib/global/qnumeric_p.h +@@ -55,6 +55,7 @@ + #include "QtCore/private/qglobal_p.h" + #include + #include ++#include + + #if defined(Q_CC_MSVC) + # include diff --git a/recipes-qt/qt5/qtbase/0018-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0018-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch new file mode 100644 index 00000000..182f8b6f --- /dev/null +++ b/recipes-qt/qt5/qtbase/0018-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch @@ -0,0 +1,41 @@ +From c72e38a57ff13ded19fcc22c5abba1a69ba84040 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 6 Dec 2018 15:06:20 -0800 +Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux + +This is required when using clang for compiler, fixes +mkspecs/features/toolchain.prf:215: Variable QMAKE_CXX.COMPILER_MACROS is not defined. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + mkspecs/features/toolchain.prf | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf +index fdf3d1cdd3..6ecfd391f6 100644 +--- a/mkspecs/features/toolchain.prf ++++ b/mkspecs/features/toolchain.prf +@@ -180,6 +180,13 @@ defineReplace(qtVariablesFromGCC) { + return($$ret) + } + ++defineReplace(qtVariablesFromCLANG) { ++ ret = $$system("$$1 $$2 -E $$system_quote($$PWD/data/macros.cpp) \ ++ <$$QMAKE_SYSTEM_NULL_DEVICE 2>$$QMAKE_SYSTEM_NULL_DEVICE", lines, ec) ++ !equals(ec, 0): qtCompilerErrror($$1, $$ret) ++ return($$ret) ++} ++ + isEmpty($${target_prefix}.COMPILER_MACROS) { + msvc { + clang_cl { +@@ -199,6 +206,8 @@ isEmpty($${target_prefix}.COMPILER_MACROS) { + } else { + vars = $$qtVariablesFromMSVC($$QMAKE_CXX) + } ++ } else: clang { ++ vars = $$qtVariablesFromCLANG($$QMAKE_CXX, $$QMAKE_CXXFLAGS) + } else: gcc { + vars = $$qtVariablesFromGCC($$QMAKE_CXX) + } diff --git a/recipes-qt/qt5/qtbase/0018-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0018-corelib-Include-sys-types.h-for-uint32_t.patch deleted file mode 100644 index c07cd2b8..00000000 --- a/recipes-qt/qt5/qtbase/0018-corelib-Include-sys-types.h-for-uint32_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From dd16d19bc6b4e8ee5d61fae94cd65b7f10d6e835 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 6 Dec 2018 11:47:52 -0800 -Subject: [PATCH] corelib: Include sys/types.h for uint32_t - -This has been includes indirectly on glibc/linux systems -via inttypes.h -> stdint.h -> sys/types.h but it breaks on -musl where this indirect include chain does not exist. - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/corelib/global/qnumeric_p.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h -index 5f8a124bcc..fe1711cf1b 100644 ---- a/src/corelib/global/qnumeric_p.h -+++ b/src/corelib/global/qnumeric_p.h -@@ -55,6 +55,7 @@ - #include "QtCore/private/qglobal_p.h" - #include - #include -+#include - - #if defined(Q_CC_MSVC) - # include diff --git a/recipes-qt/qt5/qtbase/0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch deleted file mode 100644 index 2ab04330..00000000 --- a/recipes-qt/qt5/qtbase/0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 61d8dd1cfdc6334a4d81c0f043a9515346872d0c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 6 Dec 2018 15:06:20 -0800 -Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux - -This is required when using clang for compiler, fixes -mkspecs/features/toolchain.prf:215: Variable QMAKE_CXX.COMPILER_MACROS is not defined. - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - mkspecs/features/toolchain.prf | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf -index fdf3d1cdd3..6ecfd391f6 100644 ---- a/mkspecs/features/toolchain.prf -+++ b/mkspecs/features/toolchain.prf -@@ -180,6 +180,13 @@ defineReplace(qtVariablesFromGCC) { - return($$ret) - } - -+defineReplace(qtVariablesFromCLANG) { -+ ret = $$system("$$1 $$2 -E $$system_quote($$PWD/data/macros.cpp) \ -+ <$$QMAKE_SYSTEM_NULL_DEVICE 2>$$QMAKE_SYSTEM_NULL_DEVICE", lines, ec) -+ !equals(ec, 0): qtCompilerErrror($$1, $$ret) -+ return($$ret) -+} -+ - isEmpty($${target_prefix}.COMPILER_MACROS) { - msvc { - clang_cl { -@@ -199,6 +206,8 @@ isEmpty($${target_prefix}.COMPILER_MACROS) { - } else { - vars = $$qtVariablesFromMSVC($$QMAKE_CXX) - } -+ } else: clang { -+ vars = $$qtVariablesFromCLANG($$QMAKE_CXX, $$QMAKE_CXXFLAGS) - } else: gcc { - vars = $$qtVariablesFromGCC($$QMAKE_CXX) - } diff --git a/recipes-qt/qt5/qtbase/0019-Fix-compile-issue-with-gcc-9.patch b/recipes-qt/qt5/qtbase/0019-Fix-compile-issue-with-gcc-9.patch new file mode 100644 index 00000000..e0936244 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0019-Fix-compile-issue-with-gcc-9.patch @@ -0,0 +1,31 @@ +From 4364a8fcbcc32e37b9ccbfa833e872098f038690 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Tue, 13 Nov 2018 16:00:23 +0100 +Subject: [PATCH] Fix compile issue with gcc 9 + +It appears messenne_twisters in the latest libstdc++ has one more +requirement before it is willing to construct with our +SystemGenerator struct as an sseq provider. + +Upstream-Status: Backport from 5.12 + +Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe +Reviewed-by: Giuseppe D'Angelo +Reviewed-by: Thiago Macieira +Signed-off-by: Martin Jansa +--- + src/corelib/global/qrandom.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp +index ebf9864b15..577736a867 100644 +--- a/src/corelib/global/qrandom.cpp ++++ b/src/corelib/global/qrandom.cpp +@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator + #endif // Q_OS_WINRT + + static SystemGenerator &self(); ++ typedef quint32 result_type; + void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept); + + // For std::mersenne_twister_engine implementations that use something diff --git a/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch new file mode 100644 index 00000000..e1555335 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch @@ -0,0 +1,28 @@ +From f1564bbf2829cf1006e1d2af146c0ce27e6c1fdb 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/0020-Fix-compile-issue-with-gcc-9.patch b/recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch deleted file mode 100644 index 2eb35600..00000000 --- a/recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch +++ /dev/null @@ -1,31 +0,0 @@ -From eb68b9fa27d94bc90db5b0023b224ac0e60b8243 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Tue, 13 Nov 2018 16:00:23 +0100 -Subject: [PATCH] Fix compile issue with gcc 9 - -It appears messenne_twisters in the latest libstdc++ has one more -requirement before it is willing to construct with our -SystemGenerator struct as an sseq provider. - -Upstream-Status: Backport from 5.12 - -Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe -Reviewed-by: Giuseppe D'Angelo -Reviewed-by: Thiago Macieira -Signed-off-by: Martin Jansa ---- - src/corelib/global/qrandom.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index ebf9864b15..577736a867 100644 ---- a/src/corelib/global/qrandom.cpp -+++ b/src/corelib/global/qrandom.cpp -@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator - #endif // Q_OS_WINRT - - static SystemGenerator &self(); -+ typedef quint32 result_type; - void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept); - - // For std::mersenne_twister_engine implementations that use something diff --git a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch deleted file mode 100644 index 42d94190..00000000 --- a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4ac36e3e40bd8a4940f211cf89155618149f1f68 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/0021-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0021-Avoid-renameeat2-for-native-sdk-builds.patch new file mode 100644 index 00000000..546e23c9 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0021-Avoid-renameeat2-for-native-sdk-builds.patch @@ -0,0 +1,67 @@ +From d8b2572813019c7e196cc2a66d7993acbb2d4617 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 14 Apr 2019 13:27:58 +0200 +Subject: [PATCH] Avoid renameeat2 for native(sdk) builds +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Recently pseudo changed to not support reanameeat2 as glibc wrapper [1]. This +causes massive failures at do_install [2] on qtbase. + +To work around tell Qt build configuration not to use ranameet2 independent +of glibc version. + +[1] https://git.openembedded.org/openembedded-core/commit/?id=0fb257121b68f38b40c078150db8f7d0979b7ea5 +[2] https://github.com/meta-qt5/meta-qt5/issues/187 + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andreas Müller +--- + src/corelib/global/qconfig-bootstrapped.h | 4 ++-- + src/corelib/io/qfilesystemengine_unix.cpp | 10 ---------- + 2 files changed, 2 insertions(+), 12 deletions(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index 229b4d17a1..4e2d43ffc5 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -100,14 +100,14 @@ + #define QT_FEATURE_process -1 + #define QT_FEATURE_regularexpression -1 + #ifdef __GLIBC_PREREQ +-# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++# define QT_FEATURE_renameat2 -1 + #else + # define QT_FEATURE_renameat2 -1 + #endif + #define QT_FEATURE_sharedmemory -1 + #define QT_FEATURE_slog2 -1 + #ifdef __GLIBC_PREREQ +-# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++# define QT_FEATURE_statx -1 + #else + # define QT_FEATURE_statx -1 + #endif +diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp +index 964dcebeb2..fea7f29c56 100644 +--- a/src/corelib/io/qfilesystemengine_unix.cpp ++++ b/src/corelib/io/qfilesystemengine_unix.cpp +@@ -1252,16 +1252,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy + if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) + return emptyFileEntryWarning(), false; + +-#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) +- if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) +- return true; +- +- // We can also get EINVAL for some non-local filesystems. +- if (errno != EINVAL) { +- error = QSystemError(errno, QSystemError::StandardLibraryError); +- return false; +- } +-#endif + #if defined(Q_OS_DARWIN) && defined(RENAME_EXCL) + if (__builtin_available(macOS 10.12, iOS 10, tvOS 10, watchOS 3, *)) { + if (renameatx_np(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_EXCL) == 0) diff --git a/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch index ea79e392..2fbe1265 100644 --- a/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From 03c534e00991d08897541910226256e88f0f5efc Mon Sep 17 00:00:00 2001 +From 86c2a65a7bfbc8163c93ef0856bb4eda442b8e70 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 @@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [OE specific] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index 229b4d17a1..3dbb1ea65c 100644 +index 4e2d43ffc5..992a7d7443 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -91,7 +91,7 @@ diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 67aa4c3b..ca8de801 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.13 +# 5.11.meta-qt5-shared.14 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -29,13 +29,12 @@ SRC_URI += "\ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ 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 \ - file://0016-Disable-ltcg-for-host_build.patch \ - file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ - file://0018-corelib-Include-sys-types.h-for-uint32_t.patch \ - file://0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0020-Fix-compile-issue-with-gcc-9.patch \ + file://0014-double-conversion-support-AARCH64EB-and-arm-BE.patch \ + file://0015-Disable-ltcg-for-host_build.patch \ + file://0016-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ + file://0017-corelib-Include-sys-types.h-for-uint32_t.patch \ + file://0018-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0019-Fix-compile-issue-with-gcc-9.patch \ " -- cgit v1.2.3-54-g00ecf