Patchwork webkit-gtk: remove compile-three-times hack

login
register
mail settings
Submitter Ross Burton
Date Sept. 17, 2013, 9:27 a.m.
Message ID <1379410059-19120-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/58239/
State Accepted
Commit 1b7f829de7d383e028f7e30e2a5e64b8c00b0035
Headers show

Comments

Ross Burton - Sept. 17, 2013, 9:27 a.m.
Remove the hack to handle Make 3.82 which ran make three times, as we sanity
check Make and refuse to build with the broken release.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb |   20 --------------------
 1 file changed, 20 deletions(-)

Patch

diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
index 5691d3f..30b39d2 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
@@ -86,26 +86,6 @@  do_configure_append() {
 	done
 }
 
-# A dirty hack for GNU make 3.82 bug which means 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.  This is
-# fixed in Make CVS, so 3.83 won't have this problem.
-do_compile() {
-    if [ x"$MAKE" = x ]; then MAKE=make; fi
-    bbnote ${MAKE} ${EXTRA_OEMAKE} "$@"
-    for error_count in 1 2 3; do
-        bbnote "Attempt $error_count of 3"
-        exit_code=0
-        ${MAKE} ${EXTRA_OEMAKE} "$@" || 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}
 }