Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 500230 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/net-libs/webkit-gtk/webkit-gtk-2.2.4-r200.ebuild (-5 / +20 lines)
Lines 176-181 Link Here
176
	# Do not build unittests unless requested, upstream bug #???
176
	# Do not build unittests unless requested, upstream bug #???
177
	epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch
177
	epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch
178
178
179
	# Make sure some dirs are available (created) before buggy
180
	# build scripts will try to copy generated files into them...
181
	# Also this patch add a target to build all BUILT_SOURCES
182
	# explicitly (still not in parallel, due a bloated BUILT_SOURCES) 
183
	# before everything else (can build in parallel)
184
	epatch "${FILESDIR}"/${PN}-2.2.4-parallel-build-fixes.patch
185
179
	# Prevent maintainer mode from being triggered during make
186
	# Prevent maintainer mode from being triggered during make
180
	AT_M4DIR=Source/autotools eautoreconf
187
	AT_M4DIR=Source/autotools eautoreconf
181
}
188
}
Lines 196-202 Link Here
196
203
197
	local myconf=""
204
	local myconf=""
198
205
199
	if has_version "virtual/rubygems[ruby_targets_ruby20]"; then
206
	if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
207
		myconf="${myconf} RUBY=$(type -P ruby21)"
208
	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
200
		myconf="${myconf} RUBY=$(type -P ruby20)"
209
		myconf="${myconf} RUBY=$(type -P ruby20)"
201
	elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
210
	elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
202
		myconf="${myconf} RUBY=$(type -P ruby19)"
211
		myconf="${myconf} RUBY=$(type -P ruby19)"
Lines 206-213 Link Here
206
215
207
	# TODO: Check Web Audio support
216
	# TODO: Check Web Audio support
208
	# should somehow let user select between them?
217
	# should somehow let user select between them?
209
	#
210
	# * dependency-tracking is required so parallel builds won't fail
211
	econf \
218
	econf \
212
		$(use_enable coverage) \
219
		$(use_enable coverage) \
213
		$(use_enable debug) \
220
		$(use_enable debug) \
Lines 224-235 Link Here
224
		$(use_enable webgl accelerated-compositing) \
231
		$(use_enable webgl accelerated-compositing) \
225
		--with-gtk=2.0 \
232
		--with-gtk=2.0 \
226
		--disable-webkit2 \
233
		--disable-webkit2 \
227
		--enable-dependency-tracking \
228
		--disable-gtk-doc \
234
		--disable-gtk-doc \
229
		$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
235
		--disable-gtk-doc-html \
236
		--disable-gtk-doc-pdf \
237
		$(usex aqua "--with-font-backend=pango --with-target=quartz" "") \
230
		${myconf}
238
		${myconf}
231
}
239
}
232
240
241
src_compile() {
242
	# Generate a bunch of sources in a single `make` process
243
	emake -j1 all-built-sources-local
244
	# Run parallel build for everything else
245
	emake
246
}
247
233
src_test() {
248
src_test() {
234
	# Tests expect an out-of-source build in WebKitBuild
249
	# Tests expect an out-of-source build in WebKitBuild
235
	ln -s . WebKitBuild || die "ln failed"
250
	ln -s . WebKitBuild || die "ln failed"

Return to bug 500230