diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-10-28 04:01:58 -0400 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-10-28 04:01:58 -0400 |
| commit | 892f0d6006273dde2fdd8f7fcd47d0df99d94594 (patch) | |
| tree | 14b05fcfb3e7d0a1dd75ed6d192d4a30be94a25b /net-libs | |
| parent | net-libs/webkit-gtk: avoid pulling in five different ruby implementations (diff) | |
| download | gnome-892f0d6006273dde2fdd8f7fcd47d0df99d94594.tar.gz gnome-892f0d6006273dde2fdd8f7fcd47d0df99d94594.tar.bz2 gnome-892f0d6006273dde2fdd8f7fcd47d0df99d94594.zip | |
net-libs/webkit-gtk: build fixes
It seems that explicitly generating JSNode.h is sufficient to fix
parallel make issues.
Also, pass the ruby interpeter path to configure, and force
gstreamer-0.10 to be used until gstreamer-1.0 is ready.
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild | 8 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild index 73f9a974..f457465a 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild @@ -174,12 +174,20 @@ src_configure() { $(use_enable webgl) --with-gtk=3.0 --enable-dependency-tracking + --with-gstreamer=0.10 + RUBY=$(type -P ruby18) $(use aqua && echo "--with-font-backend=pango --with-target=quartz")" # Aqua support in gtk3 is untested econf ${myconf} } +src_compile() { + # Avoid parallel make failure with -j9 + emake DerivedSources/WebCore/JSNode.h + default +} + src_test() { # Tests expect an out-of-source build in WebKitBuild ln -s . WebKitBuild || die "ln failed" diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild index a0efe2c8..6f9fac9a 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild @@ -181,12 +181,20 @@ src_configure() { --disable-gles2 --with-gtk=3.0 --enable-dependency-tracking + --with-gstreamer=0.10 + RUBY=$(type -P ruby18) $(use aqua && echo "--with-font-backend=pango --with-target=quartz")" # Aqua support in gtk3 is untested econf ${myconf} } +src_compile() { + # Avoid parallel make failure with -j9 + emake DerivedSources/WebCore/JSNode.h + default +} + src_test() { # Tests expect an out-of-source build in WebKitBuild ln -s . WebKitBuild || die "ln failed" |