diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0001-Strip-unwanted-echo-compiling-prefix-from-CC.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0001-Strip-unwanted-echo-compiling-prefix-from-CC.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Strip-unwanted-echo-compiling-prefix-from-CC.patch b/recipes-qt/qt5/qtwebengine/0001-Strip-unwanted-echo-compiling-prefix-from-CC.patch new file mode 100644 index 00000000..6b315985 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0001-Strip-unwanted-echo-compiling-prefix-from-CC.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 7a3179fee9c88ce3dd018b2f159e1b5df74fc7cc 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] Strip unwanted "@echo compiling &&" prefix from ${CC} | ||
5 | |||
6 | Causes problems when called from a perl script: | ||
7 | |||
8 | @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. | ||
9 | 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 | ||
10 | Traceback (most recent call last): | ||
11 | File "../build/scripts/action_useragentstylesheets.py", line 124, in <module> | ||
12 | sys.exit(main(sys.argv)) | ||
13 | File "../build/scripts/action_useragentstylesheets.py", line 118, in main | ||
14 | assert returnCode == 0 | ||
15 | AssertionError | ||
16 | |||
17 | Signed-off-by: Simon Busch <morphis@gravedo.de> | ||
18 | --- | ||
19 | .../WebKit/Source/build/scripts/action_useragentstylesheets.py | 3 +++ | ||
20 | 1 file changed, 3 insertions(+) | ||
21 | |||
22 | 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 | ||
23 | index c0712b3..8460637 100644 | ||
24 | --- a/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py | ||
25 | +++ b/src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/action_useragentstylesheets.py | ||
26 | @@ -112,6 +112,9 @@ def main(args): | ||
27 | command.extend([outputH, outputCpp]) | ||
28 | command.extend(styleSheets) | ||
29 | |||
30 | + if os.environ["CC"].startswith("@echo"): | ||
31 | + os.environ["CC"] = os.environ["CC"].replace("@echo compiling &&", "") | ||
32 | + | ||
33 | # Do it. check_call is new in 2.5, so simulate its behavior with call and | ||
34 | # assert. | ||
35 | returnCode = subprocess.call(command) | ||
36 | -- | ||
37 | 1.9.1 | ||
38 | |||