summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-10 17:02:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 15:13:37 +0100
commit13221b222b71fc8afdae819056aea85457a9e02e (patch)
treec01237c39fb89af2d03a65361292c16e9a633178 /meta
parent69c4ddf1387f125b2a96259955df19f86d4b505a (diff)
downloadpoky-13221b222b71fc8afdae819056aea85457a9e02e.tar.gz
webkit-gtk: work around Make bug by re-running make
GNU make 3.82 has a bug where it drops required dependencies. https://bugs.webkit.org/show_bug.cgi?id=79498 is the WebKitGTK+ bug, and http://savannah.gnu.org/bugs/?30653 is the GNU Make bug. Work around this by running make again if it fails just in case the failure is due to the bug. Based on a patch by Andreas Müller <schnitzeltony@googlemail.com>. [ YOCTO #2816 ] (From OE-Core rev: af5bdc8ca413d6cabeb4f4b4c5836912a17f28be) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb22
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb
index cf4129d41c..8beb6eb139 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
7 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ 7 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
8 file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" 8 file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"
9 9
10PR = "r1"
11
10# Choice of language backends - icu has issues on Big Endian machines so use pango 12# Choice of language backends - icu has issues on Big Endian machines so use pango
11ICU_LIB = "icu" 13ICU_LIB = "icu"
12ICU_LIB_powerpc = "pango" 14ICU_LIB_powerpc = "pango"
@@ -77,6 +79,26 @@ do_configure_append() {
77 done 79 done
78} 80}
79 81
82# A dirty hack for GNU make 3.82 bug which means it drops required
83# dependencies. https://bugs.webkit.org/show_bug.cgi?id=79498 is the WebKitGTK+
84# bug, and http://savannah.gnu.org/bugs/?30653 is the GNU Make bug. This is
85# fixed in Make CVS, so 3.83 won't have this problem.
86do_compile() {
87 if [ x"$MAKE" = x ]; then MAKE=make; fi
88 bbnote ${MAKE} ${EXTRA_OEMAKE} "$@"
89 for error_count in 1 2 3; do
90 bbnote "Attempt $error_count of 3"
91 exit_code=0
92 ${MAKE} ${EXTRA_OEMAKE} "$@" || exit_code=1
93 if [ $exit_code = 0 ]; then
94 break
95 fi
96 done
97 if [ ! $exit_code = 0 ]; then
98 die "oe_runmake failed"
99 fi
100}
101
80do_install_append() { 102do_install_append() {
81 rmdir ${D}${libexecdir} 103 rmdir ${D}${libexecdir}
82} 104}