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

Collapse All | Expand All

(-)file_not_specified_in_diff (-26 / +42 lines)
Line  Link Here
0
-- dbus-1.3.0.ebuild
0
++ dbus-1.3.0-r1.ebuild
Lines 35-40 Link Here
35
	# required for asneeded patch but also for bug 263909, cross-compile so
35
	# required for asneeded patch but also for bug 263909, cross-compile so
36
	# don't remove eautoreconf
36
	# don't remove eautoreconf
37
	eautoreconf
37
	eautoreconf
38
39
	# Copy the prepared source tree to a separate location
40
	# for running tests later
41
	if use test; then
42
		ebegin "Copying source tree to \${T}/tests"
43
		cp -a "${S}" "${T}/tests" || die "copying sources for tests failed"
44
		eend
45
	fi
38
}
46
}
39
47
40
src_compile() {
48
src_compile() {
Lines 43-67 Link Here
43
51
44
	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
52
	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
45
	# not on an SELinux profile.
53
	# not on an SELinux profile.
46
	econf \
54
	ECONF="
47
		$(use_with X x) \
55
		$(use_with X x)
48
		$(use_enable kernel_linux inotify) \
56
		$(use_enable kernel_linux inotify)
49
		$(use_enable kernel_FreeBSD kqueue) \
57
		$(use_enable kernel_FreeBSD kqueue)
50
		$(use_enable selinux) \
58
		$(use_enable selinux)
51
		$(use_enable selinux libaudit)	\
59
		$(use_enable selinux libaudit)
52
		$(use_enable debug verbose-mode) \
60
		$(use_enable debug verbose-mode)
53
		$(use_enable debug asserts) \
61
		$(use_enable debug asserts)
54
		$(use_enable test tests) \
62
		--disable-tests
55
		$(use_enable test asserts) \
63
		--with-xml=expat
56
		--with-xml=expat \
64
		--with-system-pid-file=/var/run/dbus.pid
57
		--with-system-pid-file=/var/run/dbus.pid \
65
		--with-system-socket=/var/run/dbus/system_bus_socket
58
		--with-system-socket=/var/run/dbus/system_bus_socket \
66
		--with-session-socket-dir=/tmp
59
		--with-session-socket-dir=/tmp \
67
		--with-dbus-user=messagebus
60
		--with-dbus-user=messagebus \
68
		--localstatedir=/var
61
		--localstatedir=/var \
69
		$(use_enable doc doxygen-docs)
62
		$(use_enable doc doxygen-docs) \
70
		--disable-xml-docs"
63
		--disable-xml-docs \
71
		
64
		|| die "econf failed"
72
	econf ${ECONF} || die "econf failed"
65
73
66
	# after the compile, it uses a selinuxfs interface to
74
	# after the compile, it uses a selinuxfs interface to
67
	# check if the SELinux policy has the right support
75
	# check if the SELinux policy has the right support
Lines 71-76 Link Here
71
}
79
}
72
80
73
src_test() {
81
src_test() {
82
	# We need to build in a separate tree for the tests because 
83
	# having unit tests enabled results in an insecure library
84
	cd "${T}/tests" || die "cd tests failed"
85
86
	einfo "Configuring a separate tree for building tests"
87
	econf ${ECONF} \
88
		$(use_enable test tests) \
89
		$(use_enable test asserts) \
90
		|| die "test econf failed"
91
92
	einfo "Building tests"
93
	emake || die "test make failed"
94
95
	einfo "Running tests"
74
	DBUS_VERBOSE=1 make check || die "make check failed"
96
	DBUS_VERBOSE=1 make check || die "make check failed"
75
}
97
}
76
98
Lines 130-139 Link Here
130
		ewarn "restarting the dbus service WILL restart X as well"
152
		ewarn "restarting the dbus service WILL restart X as well"
131
		ebeep 5
153
		ebeep 5
132
	fi
154
	fi
133
134
	if use test; then
135
		elog
136
		ewarn "You have unit tests enabled, this results in an insecure library"
137
		ewarn "It is recommended that you reinstall *without* FEATURES=test"
138
	fi
139
}
155
}

Return to bug 287722