summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2018-07-25 19:25:26 +0300
committerMart Raudsepp <leio@gentoo.org>2018-07-25 19:47:10 +0300
commit71cd81faf5448ecbc668a24bc9dec7663551bd19 (patch)
treea4ed7622b789ef587956cd668b2509f9f2a93e70
parentdev-libs/libxml2: remove old (diff)
downloadgentoo-71cd81faf5448ecbc668a24bc9dec7663551bd19.tar.gz
gentoo-71cd81faf5448ecbc668a24bc9dec7663551bd19.tar.bz2
gentoo-71cd81faf5448ecbc668a24bc9dec7663551bd19.zip
net-libs/webkit-gtk: fix non-parallel builds
Parallel builds might have failed too before this patch, but had to be very "lucky". Closes: https://bugs.gentoo.org/662002 Package-Manager: Portage-2.3.43, Repoman-2.3.10
-rw-r--r--net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch14
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild1
2 files changed, 15 insertions, 0 deletions
diff --git a/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch b/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch
new file mode 100644
index 000000000000..32ff3a52844f
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.20.3-jsc-build-fixes.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/662002
+https://bugs.webkit.org/show_bug.cgi?id=183788
+https://trac.webkit.org/changeset/229282/webkit
+
+Index: /trunk/Source/JavaScriptCore/CMakeLists.txt
+===================================================================
+--- a/Source/JavaScriptCore/CMakeLists.txt (revision 229281)
++++ b/Source/JavaScriptCore/CMakeLists.txt (revision 229282)
+@@ -248,4 +248,5 @@
+ )
+ target_link_libraries(LLIntOffsetsExtractor WTF)
++add_dependencies(LLIntOffsetsExtractor JavaScriptCoreForwardingHeaders)
+
+ # The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
index 69dc6b1f2ca3..50b4f8c388cf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.20.3.ebuild
@@ -147,6 +147,7 @@ pkg_setup() {
}
src_prepare() {
+ eapply "${FILESDIR}"/${PV}-jsc-build-fixes.patch
cmake-utils_src_prepare
gnome2_src_prepare
}