mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-17 04:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

webkit-gtk: work around Make bug by re-running make

Browse Source 
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>
This commit is contained in:
Ross Burton
2012-09-10 17:02:22 +01:00
committed by Richard Purdie
parent 69c4ddf138
commit 13221b222b
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
meta/recipes-sato/webkit/webkit-gtk_1.8.2.bb
View File

@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"
PR = "r1"
# Choice of language backends - icu has issues on Big Endian machines so use pango
ICU_LIB = "icu"
ICU_LIB_powerpc = "pango"
@@ -77,6 +79,26 @@ 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}
}