Patchwork [1/2] webkit-gtk: workaround races with make 3.82 by rerunning make

login
register
mail settings
Submitter Andreas Müller
Date Aug. 17, 2012, 8:55 a.m.
Message ID <1345193717-23225-1-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/34793/
State New
Headers show

Comments

Andreas Müller - Aug. 17, 2012, 8:55 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

Patch

diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
index dd43811..afd3a7a 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
@@ -81,6 +81,23 @@  do_configure_append() {
 	done
 }
 
+# dirty hack for gnu make 3.82 race condition
+do_compile() {
+    if [ x"$MAKE" = x ]; then MAKE=make; fi
+    bbnote make ${PARALLEL_MAKE} "$@"
+    for error_count in 1 2 3; do
+        bbnote "Number of trials: $error_count"
+        exit_code=0
+        make ${PARALLEL_MAKE} "$@" || exit_code=1
+        if [ $exit_code = 0 ]; then
+            break
+        fi
+    done
+    if [ ! $exit_code = 0 ]; then
+        die "oe_runmake failed"
+    fi
+}
+
 do_install_append() {
 	rmdir ${D}${libexecdir}
 }