Skip to contentSkip to conversation

WebKit fixes

PATCH Applied Ross Burton 2 participants 4 messages Jul 17, 2012 – Jul 19, 2012

lore
Share & tools
lore
#0 lore raw

cover WebKit fixes

Fix up a warning, and make compilation fast again.

This may cause failures when doing a parallel build due to a GNU Make bug, but it's harder to replicate than originally thought (I can't replicate it anymore). If we get failures again hopefully we'll be able to work out what the real cause is.

The following changes since commit 219a855f99bc45fd273f62df9507be7223eff1b4:

useradd.bbclass: Fix for multilib builds (2012-07-17 10:56:26 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ross/webkit

for you to fetch changes up to 66df0bb01e0162d51bb20b03d11157d42a057563:

webkit-gtk: remove spurious install_prepend hack (2012-07-17 19:41:43 +0100)

----------------------------------------------------------------
Ross Burton (2):
webkit-gtk: remove no-parallel bodge
webkit-gtk: remove spurious install_prepend hack

 meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb |    9 ---------
 1 file changed, 9 deletions(-)

Ross Burton (2):
webkit-gtk: remove no-parallel bodge
webkit-gtk: remove spurious install_prepend hack

 meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb |    9 ---------
 1 file changed, 9 deletions(-)
Signature · 1 line
1.7.10
#1 lore raw

PATCH 1/2 webkit-gtk: remove no-parallel bodge

This workaround was originally for GNU Make 3.82 which upstream was blaming for a parallel build failure. Since then I've changed numerous variables and now parallel builds are working with 3.82 (and succeed in 20 minutes instead of 2 hours).

Revert the change until we've more data about what causes the breakage, then we can bring it back with more finesse.

---
 meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb |    5 -----
 1 file changed, 5 deletions(-)
meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb +0 -5
index b2bfd24..3cef0e4 100644
@@ -29,11 +29,6 @@ inherit autotools lib_package pkgconfig
 
 S = "${WORKDIR}/webkit-${PV}/"
 
-# GNU Make 3.82 has a bug where it incorrectly prunes intermediate targets in
-# parallel builds.  See https://bugs.webkit.org/show_bug.cgi?id=79498 for the
-# WebKitGTK bug, and savannah.gnu.org/bugs/?30653 for the upstream bug.
-PARALLEL_MAKE = ""
-
 EXTRA_OECONF = "\
                 --enable-debug=no \
                 --enable-svg \
Signature · 1 line
1.7.10
#2 lore raw

PATCH 2/2 webkit-gtk: remove spurious install_prepend hack

In reply to Ross Burton

This "fix" causes an (ignored) error now, so at some point it was fixed.

---
 meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb |    4 ----
 1 file changed, 4 deletions(-)
meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb +0 -4
index 3cef0e4..180861e 100644
@@ -78,10 +78,6 @@ do_configure_append() {
 	done
 }
 
-do_install_prepend() {
-	cp ${S}/Programs/.libs/jsc ${S}/Programs/jsc-1 || true
-}
-
 do_install_append() {
 	rmdir ${D}${libexecdir}
 }
Signature · 1 line
1.7.10
Applied
#3 lore raw
In reply to Ross Burton
Quoted 27 lines · Ross Burton

Fix up a warning, and make compilation fast again.

This may cause failures when doing a parallel build due to a GNU Make bug, but it's harder to replicate than originally thought (I can't replicate it anymore). If we get failures again hopefully we'll be able to work out what the real cause is.

The following changes since commit 219a855f99bc45fd273f62df9507be7223eff1b4:

   useradd.bbclass: Fix for multilib builds (2012-07-17 10:56:26 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ross/webkit

for you to fetch changes up to 66df0bb01e0162d51bb20b03d11157d42a057563:

   webkit-gtk: remove spurious install_prepend hack (2012-07-17 19:41:43 +0100)

----------------------------------------------------------------
Ross Burton (2):
webkit-gtk: remove no-parallel bodge
webkit-gtk: remove spurious install_prepend hack

  meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb |    9 ---------
  1 file changed, 9 deletions(-)
Quoted 7 lines

Ross Burton (2):
webkit-gtk: remove no-parallel bodge
webkit-gtk: remove spurious install_prepend hack

  meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb |    9 ---------
  1 file changed, 9 deletions(-)

Merged into OE-Core

Thanks
Sau!