[patch] Patches to the dbus ebuild which merge the above patches and so some other work

dbus-1.3.0-r1.ebuild-interix-fixes.patch (text/plain), 1.96 KB, created by Greg Turner on 2010-01-14 03:38:30 UTC

--- /opt/gentoo/usr/portage/sys-apps/dbus/dbus-1.3.0-r1.ebuild	2010-01-09 15:06:39 -0800
+++ dbus-1.3.0-r1.ebuild	2010-01-13 18:55:33 -0800
@@ -47,6 +47,12 @@
 	[[ ${CHOST} == *-interix3* ]] && epatch "${FILESDIR}"/${PN}-1.2.1-interix3.patch
 	epatch "${FILESDIR}"/${P}-asneeded.patch
 	epatch "${FILESDIR}"/${P}-no-cloexec.patch
+	if [[ ${CHOST} == *-interix* ]] ; then
+		epatch "${FILESDIR}"/${PN}-1.3.0-interix-quirks.patch
+		epatch \
+		"${FILESDIR}"/${PN}-1.3.0-interix-just-say-no-to-fd-passing.patch
+		epatch "${FILESDIR}"/${PN}-1.3.0-interix-ignore-sigpipe.patch
+	fi
 	# required for asneeded patch but also for bug 263909, cross-compile so
 	# don't remove eautoreconf
 	eautoreconf
@@ -59,6 +65,10 @@
 
 	if [[ ${CHOST} == *-interix* ]]; then
 		export ac_cv_func_poll=no
+		append-flags -D_REENTRANT
+		dbus_dude=Administrator
+	else
+		dbus_dude=messagebus
 	fi
 
 	if [[ ${CHOST} == *-interix5* ]]; then
@@ -92,7 +102,7 @@
 		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
 		--with-system-socket=${syssocket}
 		--with-session-socket-dir=${socketdir}
-		--with-dbus-user=messagebus
+		--with-dbus-user=${dbus_dude}
 		--localstatedir="${EPREFIX}"/var"
 
 	mkdir "${BD}"
@@ -102,6 +112,14 @@
 		$(use_enable doc doxygen-docs) \
 		$(use_enable doc xml-docs)
 
+	if [[ ${CHOST} == *-interix* ]] ; then
+		# getgrouplist is incorrectly deteted by configure
+		sed \
+		-e 's:^#define[[:space:]]*HAVE_GETGROUPLIST.*$:#undef HAVE_GETGROUPLIST:' \
+		-e 's:^#define[[:space:]]*HAVE_UNIX_FD_PASSING.*$:#undef HAVE_UNIX_FD_PASSING:' \
+		-i ${BD}/config.h
+	fi
+
 	if use test; then
 		mkdir "${TBD}"
 		cd "${TBD}"
@@ -111,6 +129,12 @@
 			$(use_enable test checks) \
 			$(use_enable test tests) \
 			$(use_enable test asserts)
+		if [[ ${CHOST} == *-interix* ]] ; then
+			sed \
+			-e 's:^#define[[:space:]]*HAVE_GETGROUPLIST.*$:#undef HAVE_GETGROUPLIST:' \
+			-e 's:^#define[[:space:]]*HAVE_UNIX_FD_PASSING.*$:#undef HAVE_UNIX_FD_PASSING:' \
+			-i ${TBD}/config.h
+		fi
 	fi
 }