summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-08-14 15:06:28 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2019-08-15 10:10:47 +0300
commit63dec9bbd826a4afafa7177aaa3439467f25d80a (patch)
treeafcff4f6d8c72cb4a51f1e27cda2a65aeb55d712 /recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
parent79791026ff20539180027de0d796f8acd55bc7bf (diff)
parent53500ade778bac6e1733db43fc41c290d7b9d16b (diff)
downloadmeta-qt5-63dec9bbd826a4afafa7177aaa3439467f25d80a.tar.gz
Merge remote-tracking branch 'origin/upstream/master' into 5.13
* origin/upstream/master: qtdeclarative: Use qmlcachegen provided by OE instead of system one. qtbase-native: Always use qt provided doubleconversion library. qttools: Enable clang support when using clang qt5-creator: update to v4.9.2 maliit-framework-qt5: Fix build when ptest is enabled qtwebengine: Fix build on aarch64 qtwebengine: refresh the patches to apply qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc qt5: Upgrade to Qt 5.13.0 Allow enabling gui for native and nativesdk qt5everywheredemo: update HOMEPAGE qtconnectivity,qtsystems: Account for bluez4 from oe-core gdb_%.bbappend: Avoid PAK archive (application/x-pak) Change-Id: I24e0b7b95920df3722f84a1f3a2e74546dc74810
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
new file mode 100644
index 00000000..97b09e70
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch
@@ -0,0 +1,42 @@
1From f3345ad713ae81e4f914084b089ca7983bb76581 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 30 Mar 2017 11:37:24 +0300
4Subject: [PATCH] chromium: workaround for too long .rps file name
5
6Ninja may fail when the build directory is too long:
7
8ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
9interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
106x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
11.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
12le.rsp): Unable to create file. File name too long
13
14Task-number: QTBUG-59769
15Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
16---
17 gn/tools/gn/ninja_action_target_writer.cc | 9 +++++++++
18 1 file changed, 9 insertions(+)
19
20diff --git a/gn/tools/gn/ninja_action_target_writer.cc b/gn/tools/gn/ninja_action_target_writer.cc
21index 7e945c0de0e..3deb587668c 100644
22--- a/gn/tools/gn/ninja_action_target_writer.cc
23+++ b/gn/tools/gn/ninja_action_target_writer.cc
24@@ -118,9 +118,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
25 // strictly necessary for regular one-shot actions, but it's easier to
26 // just always define unique_name.
27 std::string rspfile = custom_rule_name;
28+
29+ //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
30+ //please note ".$unique_name" is not used at the moment
31+ int pos = 0;
32+ std::string delimiter("_");
33+ while (rspfile.length() > 250 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
34+ rspfile = rspfile.substr(0,pos);
35+
36 if (!target_->sources().empty())
37 rspfile += ".$unique_name";
38 rspfile += ".rsp";
39+
40 out_ << " rspfile = " << rspfile << std::endl;
41
42 // Response file contents.