diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-26 12:42:33 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-27 12:03:36 +0000 |
commit | 6765cbe6a255771cc1d06e5d3878c7e705769fc3 (patch) | |
tree | 377c10e198c33bb5ffa509f24748891a7e341a02 /recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch | |
parent | b84881444814a361fcc17e7eb34407fb175541da (diff) | |
parent | 40054db1de152d85c22aefdae50b136ca56967c5 (diff) | |
download | meta-qt5-6765cbe6a255771cc1d06e5d3878c7e705769fc3.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
40054db qt5: qtbase: Upgrade Double-Conversion
dd1ce3c README: Rework to start using GitHub for development
ef5f5d9 qt5: upgrade to 5.11.1
820f3ef qt5: add common PACKAGECONFIG for QtQuickCompiler
e199d80 python-pyqt5: update recipe to 5.10.1
65db89e qtbase: don't pass empty filename to function
3b27896 nativesdk-qtbase: add quotes to CC and CXX in environment file
a36cc5f libvcard: add recipe
1ac92b6 qtbase: Add packageconfigs for renameat2 and getentropy use
557aabd qttranslations: remove qtquick1 translation package
00aafa0 qt5-creator: Remove qtquick1 dependency
731334a qtwebengine: fix build with plugins as well as ozone enabled
70ce980 qtwebengine: add -fpermissive
33f58ff qtwebengine: fix build with gcc8, part II
267a38f qtwebengine: fix build with gcc8
7193a7f qtquick1: remove recipe and all references
29445f6 qtwebkit: do not skip build - use cmake as build system
dde9b55 qt5: refresh the patches and update them on meta-qt5 repositories
e0a4e23 qt5: Update to Qt 5.11.0
73f99f2 gstreamer1.0-plugins-{good,bad}: move the qt5 PACKAGECONFIG from bad to good bbappend
Change-Id: Ib58d0e103bda0b58338989c00f1fa80bd699534c
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch new file mode 100644 index 00000000..b5c6c5de --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 108bc7caf7544b47a392aac690f0d616f1c6c42e Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Thu, 30 Mar 2017 11:37:24 +0300 | ||
4 | Subject: [PATCH] chromium: workaround for too long .rps file name | ||
5 | |||
6 | Ninja may fail when the build directory is too long: | ||
7 | |||
8 | ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\ | ||
9 | interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\ | ||
10 | 6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\ | ||
11 | .0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\ | ||
12 | le.rsp): Unable to create file. File name too long | ||
13 | |||
14 | Task-number: QTBUG-59769 | ||
15 | Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1 | ||
16 | --- | ||
17 | chromium/tools/gn/ninja_action_target_writer.cc | 9 +++++++++ | ||
18 | 1 file changed, 9 insertions(+) | ||
19 | |||
20 | diff --git a/chromium/tools/gn/ninja_action_target_writer.cc b/chromium/tools/gn/ninja_action_target_writer.cc | ||
21 | index bab07c5d2b..8f889aebc1 100644 | ||
22 | --- a/chromium/tools/gn/ninja_action_target_writer.cc | ||
23 | +++ b/chromium/tools/gn/ninja_action_target_writer.cc | ||
24 | @@ -117,9 +117,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() > 251 && (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. | ||