[oe-commits] Ross Burton : webkit-gtk: remove compile-three-times hack

git at git.openembedded.org git at git.openembedded.org
Tue Sep 17 13:23:24 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: dccd55eaeaee123238372c02c34d476d68816232
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=dccd55eaeaee123238372c02c34d476d68816232

Author: Ross Burton <ross.burton at intel.com>
Date:   Tue Sep 17 10:27:39 2013 +0100

webkit-gtk: remove compile-three-times hack

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 at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)

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}
 }



More information about the Openembedded-commits mailing list