From 7388cd427d99ac7920394a31f176c0eb92521837 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 7 Aug 2019 10:27:09 +0300 Subject: meta-qt5: update submodules Change-Id: I4ec55015ee1006f7a61049bf1a8442476f129a8e Reviewed-by: Samuli Piippo --- .../0004-Fix-linker-too-long-argument-list.patch | 46 --------- .../0005-Make-linker-call-look-great-again.patch | 115 --------------------- .../0019-chromium-fix-build-with-clang.patch | 44 ++++---- ...0021-chromium-Exclude-CRC32-for-32bit-arm.patch | 18 ++-- 4 files changed, 31 insertions(+), 192 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0004-Fix-linker-too-long-argument-list.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0005-Make-linker-call-look-great-again.patch (limited to 'recipes-qt/qt5/qtwebengine') diff --git a/recipes-qt/qt5/qtwebengine/0004-Fix-linker-too-long-argument-list.patch b/recipes-qt/qt5/qtwebengine/0004-Fix-linker-too-long-argument-list.patch deleted file mode 100644 index f42a1d19..00000000 --- a/recipes-qt/qt5/qtwebengine/0004-Fix-linker-too-long-argument-list.patch +++ /dev/null @@ -1,46 +0,0 @@ -From deb9d4818d5206314f290f22330ed3b7fc33d338 Mon Sep 17 00:00:00 2001 -From: Michal Klocek -Date: Thu, 16 May 2019 21:58:06 +0200 -Subject: [PATCH] Fix linker too long argument list - -For yocto builds linker can get quite long path -since all archives are listed as absolute paths. -This can end up as "execvp: /bin/sh: Argument list too long" - -Use rsp files also for archives. - -Change-Id: I096e2f35ed72b68261bf465e84baddd1f78cd917 -Reviewed-by: Allan Sandfeld Jensen ---- - src/core/core_module.pro | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -diff --git a/src/core/core_module.pro b/src/core/core_module.pro -index e2fa3494..10169a49 100644 ---- a/src/core/core_module.pro -+++ b/src/core/core_module.pro -@@ -25,14 +25,17 @@ isEmpty(NINJA_LIBS): error("Missing library files from QtWebEngineCore linking p - NINJA_OBJECTS = $$eval($$list($$NINJA_OBJECTS)) - # Do manual response file linking for macOS and Linux - --RSP_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}.rsp --for(object, NINJA_OBJECTS): RSP_CONTENT += $$object --write_file($$RSP_FILE, RSP_CONTENT) --macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_FILE) --linux:LIBS_PRIVATE += @$$RSP_FILE -+RSP_OBJECT_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}_o.rsp -+for(object, NINJA_OBJECTS): RSP_O_CONTENT += $$object -+write_file($$RSP_OBJECT_FILE, RSP_O_CONTENT) -+RSP_ARCHIVE_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}_a.rsp -+for(archive, NINJA_ARCHIVES): RSP_A_CONTENT += $$archive -+write_file($$RSP_ARCHIVE_FILE, RSP_A_CONTENT) -+macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_OBJECT_FILE) -+linux:LIBS_PRIVATE += @$${RSP_OBJECT_FILE} - # QTBUG-58710 add main rsp file on windows --win32:QMAKE_LFLAGS += @$$RSP_FILE --linux: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group -+win32:QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} -+linux: LIBS_PRIVATE += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group - else: LIBS_PRIVATE += $$NINJA_ARCHIVES - LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS - # GN's LFLAGS doesn't always work across all the Linux configurations we support. diff --git a/recipes-qt/qt5/qtwebengine/0005-Make-linker-call-look-great-again.patch b/recipes-qt/qt5/qtwebengine/0005-Make-linker-call-look-great-again.patch deleted file mode 100644 index 74afaac1..00000000 --- a/recipes-qt/qt5/qtwebengine/0005-Make-linker-call-look-great-again.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 9ef91351545ef5543b469ef24282334b3d068a2b Mon Sep 17 00:00:00 2001 -From: Michal Klocek -Date: Fri, 17 May 2019 15:49:23 +0200 -Subject: [PATCH] Make linker call look great again - -Fix issues with messed up linker path: - - * do not use LIBS_PRIVATE on linux at least for passing object - and archive responses files. - * do not use QT and QT_PRIVATE with same libs, it simply - includes libs in LIB and LIB_PRIVATE so doubles linker libs. - * remove bogus dependency for gui and core for webengineheaders pseudo module. - * remove unused egl config flag - -Fixes: QTBUG-75832 -Task-number: QTBUG-75357 -Change-Id: I1720394e636e3f89d546f372b10932dd4ad395fe -Reviewed-by: Allan Sandfeld Jensen ---- - src/core/core_chromium.pri | 2 -- - src/core/core_common.pri | 4 ++-- - src/core/core_headers.pro | 1 + - src/core/core_module.pro | 13 ++++++------- - 4 files changed, 9 insertions(+), 11 deletions(-) - -diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri -index 4d8db0d1..d8ef25d8 100644 ---- a/src/core/core_chromium.pri -+++ b/src/core/core_chromium.pri -@@ -33,8 +33,6 @@ RCC_DIR = $$OUT_PWD/$$getConfigDir()/.rcc - # whenever we are cross compiling. - qtConfig(webengine-embedded-build): DEFINES += QTWEBENGINE_EMBEDDED_SWITCHES - --qtConfig(egl): CONFIG += egl -- - INCLUDEPATH += $$PWD $$PWD/api - - clang_cl { -diff --git a/src/core/core_common.pri b/src/core/core_common.pri -index 8375d89e..51f5e21b 100644 ---- a/src/core/core_common.pri -+++ b/src/core/core_common.pri -@@ -2,8 +2,8 @@ - # gyp/ninja will take care of the compilation, qmake/make will finish with linking and install. - - TARGET = QtWebEngineCore --QT += qml quick --QT_PRIVATE += quick-private gui-private core-private webenginecoreheaders-private -+QT += qml-private quick-private gui-private core-private -+QT_PRIVATE += webenginecoreheaders-private - - qtConfig(webengine-geolocation): QT += positioning - qtConfig(webengine-webchannel): QT += webchannel -diff --git a/src/core/core_headers.pro b/src/core/core_headers.pro -index 21b5d58c..cd5352eb 100644 ---- a/src/core/core_headers.pro -+++ b/src/core/core_headers.pro -@@ -1,5 +1,6 @@ - TARGET = QtWebEngineCore - CONFIG += no_private_module header_module internal_module no_plist -+QT -= core gui - MODULE = webenginecoreheaders - MODULE_CFG_FILE = qtwebenginecore-config - load(qt_module) -diff --git a/src/core/core_module.pro b/src/core/core_module.pro -index 10169a49..2bfbc65b 100644 ---- a/src/core/core_module.pro -+++ b/src/core/core_module.pro -@@ -10,8 +10,6 @@ linking_pri = $$OUT_PWD/$$getConfigDir()/$${TARGET}.pri - error("Could not find the linking information that gn should have generated.") - } - --load(qt_module) -- - api_library_name = qtwebenginecoreapi$$qtPlatformTargetSuffix() - api_library_path = $$OUT_PWD/api/$$getConfigDir() - -@@ -32,10 +30,10 @@ RSP_ARCHIVE_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}_a.rsp - for(archive, NINJA_ARCHIVES): RSP_A_CONTENT += $$archive - write_file($$RSP_ARCHIVE_FILE, RSP_A_CONTENT) - macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_OBJECT_FILE) --linux:LIBS_PRIVATE += @$${RSP_OBJECT_FILE} -+linux:QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} - # QTBUG-58710 add main rsp file on windows - win32:QMAKE_LFLAGS += @$${RSP_OBJECT_FILE} --linux: LIBS_PRIVATE += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group -+linux:QMAKE_LFLAGS += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group - else: LIBS_PRIVATE += $$NINJA_ARCHIVES - LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS - # GN's LFLAGS doesn't always work across all the Linux configurations we support. -@@ -74,7 +72,7 @@ osx { - # API library as response file to the linker. - QMAKE_LFLAGS += @$${api_library_path}$${QMAKE_DIR_SEP}$${api_library_name}.lib.objects - } else { -- LIBS_PRIVATE += -Wl,-whole-archive -l$$api_library_name -Wl,-no-whole-archive -+ QMAKE_LFLAGS += -Wl,-whole-archive -l$$api_library_name -Wl,-no-whole-archive - } - - win32 { -@@ -87,8 +85,6 @@ win32 { - # and doesn't let Chromium get access to libc symbols through dlsym. - CONFIG -= bsymbolic_functions - --qtConfig(egl): CONFIG += egl -- - linux:qtConfig(separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)" - - REPACK_DIR = $$OUT_PWD/$$getConfigDir() -@@ -157,3 +153,6 @@ OTHER_FILES = \ - $$files(../3rdparty/chromium/*.gypi, true) \ - $$files(../3rdparty/chromium/*.gn, true) \ - $$files(../3rdparty/chromium/*.gni, true) -+ -+load(qt_module) -+ diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch index 7823482b..8000969b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch @@ -1,4 +1,4 @@ -From 249b99b4b54468b428a156f33e2a72066c82e9c2 Mon Sep 17 00:00:00 2001 +From a26e5b6c8cf6fccbd473ca61b2d0038703bb0b99 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Feb 2019 19:28:59 -0800 Subject: [PATCH] chromium: fix build with clang @@ -10,24 +10,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn -index d223a4f6fd4..1c42c49ea4a 100644 +index 127d0c4..eca0ce1 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -561,13 +561,6 @@ config("compiler") { - } - } - -- # Tells the compiler not to use absolute paths when passing the default -- # paths to the tools it invokes. We don't want this because we don't -- # really need it and it can mess up the goma cache entries. -- if (is_clang && !is_nacl) { -- cflags += [ "-no-canonical-prefixes" ] -- } -- - # C11/C++11 compiler flags setup. - # --------------------------- - if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { -@@ -799,8 +792,6 @@ config("compiler_cpu_abi") { +@@ -746,8 +746,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl) { @@ -36,7 +22,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 } if (!is_nacl) { cflags += [ -@@ -813,8 +804,6 @@ config("compiler_cpu_abi") { +@@ -760,8 +758,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia) { @@ -45,7 +31,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] -@@ -823,9 +812,6 @@ config("compiler_cpu_abi") { +@@ -770,9 +766,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -55,7 +41,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 } } else { cflags += [ "-EL" ] -@@ -904,10 +890,7 @@ config("compiler_cpu_abi") { +@@ -851,10 +844,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -67,7 +53,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 cflags += [ "-EB" ] ldflags += [ "-EB" ] } -@@ -954,9 +937,6 @@ config("compiler_cpu_abi") { +@@ -901,9 +891,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -77,7 +63,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 } } else { cflags += [ -@@ -1013,10 +993,7 @@ config("compiler_cpu_abi") { +@@ -960,10 +947,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips64") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -89,3 +75,17 @@ index d223a4f6fd4..1c42c49ea4a 100644 cflags += [ "-EB", "-mabi=64", +@@ -1137,13 +1121,6 @@ config("compiler_deterministic") { + } + } + } +- +- # Tells the compiler not to use absolute paths when passing the default +- # paths to the tools it invokes. We don't want this because we don't +- # really need it and it can mess up the goma cache entries. +- if (is_clang && !is_nacl) { +- cflags += [ "-no-canonical-prefixes" ] +- } + } + + config("clang_revision") { diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch index a0b73a7b..7730e712 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch @@ -1,4 +1,4 @@ -From b882013421036a05ea8c909292cc38d05fc29c89 Mon Sep 17 00:00:00 2001 +From ffb83a8c687c18ec05bcf3397f08f6387b4c1ac2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 5 Feb 2019 14:32:20 -0800 Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm @@ -15,20 +15,20 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn -index 05907b481ac..dbc4be143cd 100644 +index b9f1bba..e8a5c58 100644 --- a/chromium/third_party/zlib/BUILD.gn +++ b/chromium/third_party/zlib/BUILD.gn -@@ -74,9 +74,11 @@ if (use_arm_neon_optimizations) { - # implement the CRC32* instructions. These are optional in ARMv8.0." - # - Fuchsia just added a syscall for feature detection. - # TODO(cavalcantii): crbug.com/810125. +@@ -77,9 +77,11 @@ if (use_arm_neon_optimizations) { + # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: + # "All implementations of the ARMv8.1 architecture are required to + # implement the CRC32* instructions. These are optional in ARMv8.0." + defines = [] - if (is_clang && (!is_ios && !is_fuchsia)) { + if (is_clang && !is_ios) { - defines = [ "CRC32_ARMV8_CRC32" ] - if (is_android) { + if (current_cpu == "arm64") { -+ defines += [ "CRC32_ARMV8_CRC32" ] -+ } if (is_android) { ++ defines += [ "CRC32_ARMV8_CRC32" ] ++ } if (is_android) { defines += [ "ARMV8_OS_ANDROID" ] } else if (is_linux || is_chromeos) { defines += [ "ARMV8_OS_LINUX" ] -- cgit v1.2.3-54-g00ecf