diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-01 17:36:38 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-06 19:45:45 +0200 |
commit | 26b7fee65a3c23a9c2447d549668f373bfa76bae (patch) | |
tree | fca7565930f8d7705cb5d96c5bc5ce6d7e561a0c /recipes-qt/qt5/qtwebengine/0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch | |
parent | 0663bcdddf0311329e607416cd51ce55b9557240 (diff) | |
download | meta-qt5-26b7fee65a3c23a9c2447d549668f373bfa76bae.tar.gz |
qtwebengine: Add 2 more patches to fix do_configure and fix QA warning
* otherwise moc generated files have the same basename and do_configure fails with:
core_generated.gyp:QtWebEngineCore#target has several files with the same basename:
| javascript_dialog_controller: javascript_dialog_controller.cpp
| /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOINC+21f6ce84ec-r0/git/src/core/.moc/moc_/OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOI.moc+21f6ce84ec-r0/git/src/core/javascript_dialog_controller.cpp
...
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch new file mode 100644 index 00000000..0cbe7aa4 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From faaba972642f1966b4e38394b022d79de114c71e Mon Sep 17 00:00:00 2001 | ||
2 | From: Simon Busch <morphis@gravedo.de> | ||
3 | Date: Fri, 20 Jun 2014 19:04:14 +0200 | ||
4 | Subject: [PATCH 2/2] <chromium> Strip unwanted "@echo compiling &&" prefix | ||
5 | from ${CC} | ||
6 | |||
7 | Causes problems when called from a perl script: | ||
8 | |||
9 | @echo compiling && arm-webos-linux-gnueabi-gcc -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon --sysroot=/home/morphis/work/wop/webos-ports/tmp-eglibc/sysroots/tenderloinCan't exec "@echo": No such file or directory at /home/morphis/work/wop/webos-ports/tmp-eglibc/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.14.3/IPC/Open3.pm line 288. | ||
10 | open2: exec of @echo compiling && arm-webos-linux-gnueabi-gcc -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon --sysroot=/home/morphis/work/wop/webos-ports/tmp-eglibc/sysroots/tenderloin -E -P -x c++ -DENABLE_CUSTOM_SCHEME_HANDLER=0 -DENABLE_SVG_FONTS=1 -DENABLE_GDI_FONTS_ON_WINDOWS=0 -DENABLE_HARFBUZZ_ON_WINDOWS=1 -DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1 -DENABLE_INPUT_SPEECH=1 -DENABLE_INPUT_MULTIPLE_FIELDS_UI=1 -DENABLE_LEGACY_NOTIFICATIONS=1 -DENABLE_MEDIA_CAPTURE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=1 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_WEB_AUDIO=1 -DWTF_USE_WEBAUDIO_FFMPEG=1 -DENABLE_OPENTYPE_VERTICAL=1 -DWTF_USE_DEFAULT_RENDER_THEME=1 css/html.css failed at ../build/scripts/preprocessor.pm line 81 | ||
11 | Traceback (most recent call last): | ||
12 | File "../build/scripts/action_useragentstylesheets.py", line 124, in <module> | ||
13 | sys.exit(main(sys.argv)) | ||
14 | File "../build/scripts/action_useragentstylesheets.py", line 118, in main | ||
15 | assert returnCode == 0 | ||
16 | AssertionError | ||
17 | |||
18 | Signed-off-by: Simon Busch <morphis@gravedo.de> | ||
19 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
20 | --- | ||
21 | .../WebKit/Source/build/scripts/action_useragentstylesheets.py | 3 +++ | ||
22 | 1 file changed, 3 insertions(+) | ||
23 | |||
24 | diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py b/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py | ||
25 | index c0712b3..8460637 100644 | ||
26 | --- a/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py | ||
27 | +++ b/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py | ||
28 | @@ -112,6 +112,9 @@ def main(args): | ||
29 | command.extend([outputH, outputCpp]) | ||
30 | command.extend(styleSheets) | ||
31 | |||
32 | + if os.environ["CC"].startswith("@echo"): | ||
33 | + os.environ["CC"] = os.environ["CC"].replace("@echo compiling &&", "") | ||
34 | + | ||
35 | # Do it. check_call is new in 2.5, so simulate its behavior with call and | ||
36 | # assert. | ||
37 | returnCode = subprocess.call(command) | ||
38 | -- | ||
39 | 2.0.0 | ||
40 | |||