Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 541518
Collapse All | Expand All

(-)a/app-admin/collectd/collectd-5.4.2.ebuild (+12 lines)
Lines 236-241 src_configure() { Link Here
236
		memory md netlink nfs numa processes serial swap tcpconns thermal users vmem vserver
236
		memory md netlink nfs numa processes serial swap tcpconns thermal users vmem vserver
237
		wireless"
237
		wireless"
238
238
239
	local need_libstatgrab=0
239
	local libstatgrab_plugins="cpu disk interface load memory swap users"
240
	local libstatgrab_plugins="cpu disk interface load memory swap users"
240
	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins}"
241
	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins}"
241
242
Lines 271-276 src_configure() { Link Here
271
			if has ${plugin} ${myos_plugins}; then
272
			if has ${plugin} ${myos_plugins}; then
272
				# ... and available in this os
273
				# ... and available in this os
273
				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
274
				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
275
				# ... must we link against libstatgrab? Bug #541518
276
				if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
277
					einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
278
					need_libstatgrab=1
279
				fi
274
			else
280
			else
275
				# ... and NOT available in this os
281
				# ... and NOT available in this os
276
				if use collectd_plugins_${plugin}; then
282
				if use collectd_plugins_${plugin}; then
Lines 291-296 src_configure() { Link Here
291
		fi
297
		fi
292
	done
298
	done
293
299
300
	if [ "${need_libstatgrab}" -eq 1 ]; then
301
		myconf+=" --with-libstatgrab"
302
	else
303
		myconf+=" --without-libstatgrab"
304
	fi
305
294
	# Need JAVA_HOME for java.
306
	# Need JAVA_HOME for java.
295
	if use collectd_plugins_java; then
307
	if use collectd_plugins_java; then
296
		myconf+=" --with-java=$(java-config -g JAVA_HOME)"
308
		myconf+=" --with-java=$(java-config -g JAVA_HOME)"

Return to bug 541518