summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-17 10:27:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-17 14:35:17 +0100
commit1b7f829de7d383e028f7e30e2a5e64b8c00b0035 (patch)
tree0d7f66d460f04f1d8f4d2b5bc503e591cda71de7 /meta/recipes-sato
parent42ef04b3648f4e29ed130ff8e37800f5aac44b15 (diff)
downloadpoky-1b7f829de7d383e028f7e30e2a5e64b8c00b0035.tar.gz
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. (From OE-Core rev: dccd55eaeaee123238372c02c34d476d68816232) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb20
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 5691d3f4dd..30b39d245f 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() {
86 done 86 done
87} 87}
88 88
89# A dirty hack for GNU make 3.82 bug which means it drops required
90# dependencies. https://bugs.webkit.org/show_bug.cgi?id=79498 is the WebKitGTK+
91# bug, and http://savannah.gnu.org/bugs/?30653 is the GNU Make bug. This is
92# fixed in Make CVS, so 3.83 won't have this problem.
93do_compile() {
94 if [ x"$MAKE" = x ]; then MAKE=make; fi
95 bbnote ${MAKE} ${EXTRA_OEMAKE} "$@"
96 for error_count in 1 2 3; do
97 bbnote "Attempt $error_count of 3"
98 exit_code=0
99 ${MAKE} ${EXTRA_OEMAKE} "$@" || exit_code=1
100 if [ $exit_code = 0 ]; then
101 break
102 fi
103 done
104 if [ ! $exit_code = 0 ]; then
105 die "oe_runmake failed"
106 fi
107}
108
109do_install_append() { 89do_install_append() {
110 rmdir ${D}${libexecdir} 90 rmdir ${D}${libexecdir}
111} 91}