ca92b35948
Moved from aports/main to aports/luna, so we can disable the entire folder from building in the binary repository: * qt5-qtwebengine * postmarketos-ui-luna
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
From 5c31bc4a7ae6133fe4cb60fa71465c6706a071c8 Mon Sep 17 00:00:00 2001
|
|
From: Samuli Piippo <samuli.piippo@qt.io>
|
|
Date: Thu, 30 Mar 2017 11:37:24 +0300
|
|
Subject: [PATCH] chromium: workaround for too long .rps file name
|
|
|
|
Ninja may fail when the build directory is too long:
|
|
|
|
ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
|
|
interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
|
|
6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
|
|
.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
|
|
le.rsp): Unable to create file. File name too long
|
|
|
|
Task-number: QTBUG-59769
|
|
Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
|
|
---
|
|
chromium/tools/gn/ninja_action_target_writer.cc | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/src/3rdparty/chromium/tools/gn/ninja_action_target_writer.cc b/src/3rdparty/chromium/tools/gn/ninja_action_target_writer.cc
|
|
index a5bc6cd526..5cefbfe77c 100644
|
|
--- a/src/3rdparty/chromium/tools/gn/ninja_action_target_writer.cc
|
|
+++ b/src/3rdparty/chromium/tools/gn/ninja_action_target_writer.cc
|
|
@@ -115,9 +115,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
|
|
// strictly necessary for regular one-shot actions, but it's easier to
|
|
// just always define unique_name.
|
|
std::string rspfile = custom_rule_name;
|
|
+
|
|
+ //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
|
|
+ //please note ".$unique_name" is not used at the moment
|
|
+ int pos = 0;
|
|
+ std::string delimiter("_");
|
|
+ while (rspfile.length() > 251 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
|
|
+ rspfile = rspfile.substr(0,pos);
|
|
+
|
|
if (!target_->sources().empty())
|
|
rspfile += ".$unique_name";
|
|
rspfile += ".rsp";
|
|
+
|
|
out_ << " rspfile = " << rspfile << std::endl;
|
|
|
|
// Response file contents.
|