diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 01:05:55 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-21 21:01:40 +0000 |
commit | c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0 (patch) | |
tree | 821445c6e1fe46948cd9fba26480ed359288b545 /recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch | |
parent | c6be23d3b01b046d2142bb6fc017078f6154ddb5 (diff) | |
download | meta-qt5-c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0.tar.gz |
qt5: upgrade to latest revision in 5.12
* WIP
* zlib temporarily disabled in qtbase-native, the configure fails too
find it even when it is in RSS:
docker-shr qemux86-64@ ~/build/oe-core $ find /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0 -name zlib\*
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/freetype/src/gzip/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib.pri
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib/src/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib_dependency.pri
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/lib/pkgconfig/zlib.pc
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/include/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/sysroot-providers/zlib-native
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.2dcdd26b684916aff89d13cb1c919939
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.complete
ERROR: Feature 'system-zlib' was enabled, but the pre-condition 'libs.zlib' failed.
* fixes #136
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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, 0 insertions, 42 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 deleted file mode 100644 index f80f7b0a..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 70c519aa0eb4da6565ad78914a8687b6f5bf1bb8 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 bab07c5d2bb..8f889aebc18 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. | ||