webkit-gtk3: use bison25 to fix build; add patch for parallel build.

This commit is contained in:
Juan RP 2012-07-21 20:08:35 +02:00
parent aaa157fd80
commit aee1e089e8
2 changed files with 36 additions and 6 deletions

View file

@ -0,0 +1,20 @@
https://bugs.webkit.org/show_bug.cgi?id=79498
--- GNUmakefile.am
+++ GNUmakefile.am
@@ -285,6 +285,15 @@
all-local: stamp-po
$(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
+# Horrible hack to enable workaround for parallel make failure
+all-built-sources-local: $(BUILT_SOURCES) autotoolsconfig.h
+
+all-ltlibraries-local: GNUmakefile $(LTLIBRARIES)
+
+all-programs-local: GNUmakefile $(PROGRAMS)
+
+all-data-local: GNUmakefile $(DATA)
+
# remove built sources and program directories
clean-local:
-rm -rf $(GENPROGRAMS)

View file

@ -3,10 +3,11 @@ pkgname=webkit-gtk3
version=1.8.1
revision=3
wrksrc=webkit-${version}
makedepends="perl pkg-config intltool which gperf flex jpeg-devel
libpng-devel>=1.5.10 sqlite-devel gtk+-devel gtk+3-devel
makedepends="automake perl pkg-config intltool which gperf bison25 flex
jpeg-devel libpng-devel>=1.5.10 sqlite-devel gtk+-devel gtk+3-devel
gst-plugins-base-devel libsoup-devel libxslt-devel icu-devel>=49
enchant-devel geoclue-devel gobject-introspection"
subpackages="webkit-gtk webkit-gtk-devel $pkgname-devel"
short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://webkitgtk.org/"
@ -22,10 +23,9 @@ long_desc="
This is the GTK3+ port of the engine."
disable_parallel_build=yes
subpackages="webkit-gtk webkit-gtk-devel $pkgname-devel"
do_configure() {
autoreconf -fi -I Source/autotools
local args="--enable-video --enable-jit \
--with-font-backend=freetype --enable-introspection \
--with-unicode-backend=icu --disable-schemas-compile \
@ -44,7 +44,17 @@ do_build() {
for ver in 2 3; do
msg_normal "Building GTK+${ver} version...\n"
cd ${wrksrc}/build-gtk${ver}
make ${makejobs} || return 1
# Horrible hack to build in parallel (Gentoo)
# see https://bugs.webkit.org/show_bug.cgi?id=79498
make all-built-sources-local
make ${makejobs} all-ltlibraries-local
make ${makejobs} all-programs-local
if [ "$ver" = "2" ]; then
make ${makejobs} WebKit-1.0.gir
else
make ${makejobs} WebKit-3.0.gir
fi
make ${makejobs} all-data-local
done
}