webkit-gtk3: remove parallel build hacks, not needed anymore.
This commit is contained in:
parent
45b8a9d8e6
commit
fbe2fddd99
2 changed files with 4 additions and 37 deletions
|
@ -1,20 +0,0 @@
|
||||||
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)
|
|
|
@ -3,7 +3,7 @@ pkgname=webkit-gtk3
|
||||||
version=1.8.3
|
version=1.8.3
|
||||||
revision=1
|
revision=1
|
||||||
wrksrc=webkit-${version}
|
wrksrc=webkit-${version}
|
||||||
makedepends="automake perl pkg-config intltool which gperf bison25 flex
|
makedepends="perl pkg-config intltool which gperf bison25 flex
|
||||||
jpeg-devel libpng-devel>=1.5.10 sqlite-devel gtk+-devel gtk+3-devel
|
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
|
gst-plugins-base-devel libsoup-devel libxslt-devel icu-devel>=49
|
||||||
enchant-devel geoclue-devel gobject-introspection"
|
enchant-devel geoclue-devel gobject-introspection"
|
||||||
|
@ -24,11 +24,8 @@ long_desc="
|
||||||
This is the GTK3+ port of the engine."
|
This is the GTK3+ port of the engine."
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
sed -i -e 's:mkdir_p:MKDIR_P:' {.,Source/WebKit/gtk/po}/GNUmakefile.am
|
local args="--enable-jit --with-font-backend=freetype \
|
||||||
autoreconf -fi -I Source/autotools
|
--enable-introspection \
|
||||||
|
|
||||||
local args="--enable-jit --enable-dependency-tracking \
|
|
||||||
--with-font-backend=freetype --enable-introspection \
|
|
||||||
--with-unicode-backend=icu --disable-schemas-compile \
|
--with-unicode-backend=icu --disable-schemas-compile \
|
||||||
${CONFIGURE_SHARED_ARGS}"
|
${CONFIGURE_SHARED_ARGS}"
|
||||||
|
|
||||||
|
@ -44,17 +41,7 @@ do_build() {
|
||||||
for ver in 2 3; do
|
for ver in 2 3; do
|
||||||
msg_normal "Building GTK+${ver} version...\n"
|
msg_normal "Building GTK+${ver} version...\n"
|
||||||
cd ${wrksrc}/build-gtk${ver}
|
cd ${wrksrc}/build-gtk${ver}
|
||||||
# Horrible hack to build in parallel (Gentoo)
|
make ${makejobs}
|
||||||
# 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 all-data-local
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue