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

Collapse All | Expand All

(-)/opt/gentoo/usr/portage/sys-apps/dbus/dbus-1.3.0-r1.ebuild (-1 / +25 lines)
Lines 47-52 Link Here
47
	[[ ${CHOST} == *-interix3* ]] && epatch "${FILESDIR}"/${PN}-1.2.1-interix3.patch
47
	[[ ${CHOST} == *-interix3* ]] && epatch "${FILESDIR}"/${PN}-1.2.1-interix3.patch
48
	epatch "${FILESDIR}"/${P}-asneeded.patch
48
	epatch "${FILESDIR}"/${P}-asneeded.patch
49
	epatch "${FILESDIR}"/${P}-no-cloexec.patch
49
	epatch "${FILESDIR}"/${P}-no-cloexec.patch
50
	if [[ ${CHOST} == *-interix* ]] ; then
51
		epatch "${FILESDIR}"/${PN}-1.3.0-interix-quirks.patch
52
		epatch \
53
		"${FILESDIR}"/${PN}-1.3.0-interix-just-say-no-to-fd-passing.patch
54
		epatch "${FILESDIR}"/${PN}-1.3.0-interix-ignore-sigpipe.patch
55
	fi
50
	# required for asneeded patch but also for bug 263909, cross-compile so
56
	# required for asneeded patch but also for bug 263909, cross-compile so
51
	# don't remove eautoreconf
57
	# don't remove eautoreconf
52
	eautoreconf
58
	eautoreconf
Lines 59-64 Link Here
59
65
60
	if [[ ${CHOST} == *-interix* ]]; then
66
	if [[ ${CHOST} == *-interix* ]]; then
61
		export ac_cv_func_poll=no
67
		export ac_cv_func_poll=no
68
		append-flags -D_REENTRANT
69
		dbus_dude=Administrator
70
	else
71
		dbus_dude=messagebus
62
	fi
72
	fi
63
73
64
	if [[ ${CHOST} == *-interix5* ]]; then
74
	if [[ ${CHOST} == *-interix5* ]]; then
Lines 92-98 Link Here
92
		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
102
		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
93
		--with-system-socket=${syssocket}
103
		--with-system-socket=${syssocket}
94
		--with-session-socket-dir=${socketdir}
104
		--with-session-socket-dir=${socketdir}
95
		--with-dbus-user=messagebus
105
		--with-dbus-user=${dbus_dude}
96
		--localstatedir="${EPREFIX}"/var"
106
		--localstatedir="${EPREFIX}"/var"
97
107
98
	mkdir "${BD}"
108
	mkdir "${BD}"
Lines 102-107 Link Here
102
		$(use_enable doc doxygen-docs) \
112
		$(use_enable doc doxygen-docs) \
103
		$(use_enable doc xml-docs)
113
		$(use_enable doc xml-docs)
104
114
115
	if [[ ${CHOST} == *-interix* ]] ; then
116
		# getgrouplist is incorrectly deteted by configure
117
		sed \
118
		-e 's:^#define[[:space:]]*HAVE_GETGROUPLIST.*$:#undef HAVE_GETGROUPLIST:' \
119
		-e 's:^#define[[:space:]]*HAVE_UNIX_FD_PASSING.*$:#undef HAVE_UNIX_FD_PASSING:' \
120
		-i ${BD}/config.h
121
	fi
122
105
	if use test; then
123
	if use test; then
106
		mkdir "${TBD}"
124
		mkdir "${TBD}"
107
		cd "${TBD}"
125
		cd "${TBD}"
Lines 111-116 Link Here
111
			$(use_enable test checks) \
129
			$(use_enable test checks) \
112
			$(use_enable test tests) \
130
			$(use_enable test tests) \
113
			$(use_enable test asserts)
131
			$(use_enable test asserts)
132
		if [[ ${CHOST} == *-interix* ]] ; then
133
			sed \
134
			-e 's:^#define[[:space:]]*HAVE_GETGROUPLIST.*$:#undef HAVE_GETGROUPLIST:' \
135
			-e 's:^#define[[:space:]]*HAVE_UNIX_FD_PASSING.*$:#undef HAVE_UNIX_FD_PASSING:' \
136
			-i ${TBD}/config.h
137
		fi
114
	fi
138
	fi
115
}
139
}
116
140

Return to bug 300929