From patchwork Wed Aug 15 16:18:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/2] webkit-gtk: add depends on make-replacement-native Date: Wed, 15 Aug 2012 16:18:50 -0000 From: Ross Burton X-Patchwork-Id: 34647 Message-Id: <127bffbf550f6357ad14c1b5b03c1c908e4e51e2.1345047378.git.ross.burton@intel.com> To: openembedded-core@lists.openembedded.org Depend on make-replacement-native 3.81 so that we're certainly not building with make 3.82, which some distributions have moved to. 3.82 is known to fail to build webkit-gtk with -j and building without parallelism really isn't an option. See https://bugs.webkit.org/show_bug.cgi?id=79498 for the WebKitGTK bug, and savannah.gnu.org/bugs/?30653 for the GNU Make bug regarding the problems with 3.82. [ YOCTO #2816 ] Signed-off-by: Ross Burton --- meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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..e6aed7d 100644 --- a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb +++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb @@ -7,14 +7,16 @@ 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" +PR = "r2" # Choice of language backends - icu has issues on Big Endian machines so use pango ICU_LIB = "icu" ICU_LIB_powerpc = "pango" -DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ - gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" +DEPENDS = "make-replacement-native zlib enchant gnome-keyring libsoup-2.4 curl \ + libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer \ + gst-plugins-base flex-native gperf-native perl-native-runtime \ + sqlite3 ${ICU_LIB}" DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" PR = "r1"