[patch] Updated ebuild patch (relative to rsync version)

glib-2.22.4_ebuild.patch (text/plain), 1.85 KB, created by Greg Turner on 2010-01-31 06:32:38 UTC

--- /opt/gentoo/usr/portage/dev-libs/glib/glib-2.22.4.ebuild	2010-01-29 12:31:52 -0800
+++ glib-2.22.4.ebuild	2010-01-30 21:33:24 -0800
@@ -20,10 +20,10 @@
 	fam? ( virtual/fam )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.16
-	x86-winnt? ( >=dev-util/gtk-doc-am-1.11 )
+	x86-winnt? ( >=dev-util/gtk-doc-am-1.13 )
 	x86-interix? ( 
 		sys-libs/itx-bind
-		>=dev-util/gtk-doc-am-1.11 
+		>=dev-util/gtk-doc-am-1.13 
 	)
 	doc? (
 		>=dev-libs/libxslt-1.0
@@ -62,7 +62,8 @@
 	epatch "${FILESDIR}"/${PN}-2.16.3-macos-inline.patch
 	epatch "${FILESDIR}"/${PN}-2.18.4-compile-warning-sol64.patch
 	epatch "${FILESDIR}"/${PN}-2.20.3-mint.patch
-	# configure script lets itself being fooled by bind 8 stuff
+
+	# configure script lets itself be fooled by bind 8 stuff
 	[[ ${CHOST} == *-darwin[678] ]] && append-libs -lresolv
 
 	# make default sane for us
@@ -85,17 +86,27 @@
 		# there are hunks disabling some GTK_DOC macros - i guess that
 		# the gtk-doc-am package in the tree is too old to bootstrap
 		# glib correctly ... :/
-		epatch "${FILESDIR}"/${P}-interix.patch
+		epatch "${FILESDIR}"/${PN}-2.22.3-interix.patch
+		epatch "${FILESDIR}"/${P}-interix-pthread.patch
 
 		# interix 3 and 5 have no ipv6 support, so take it out (phew...)
 		if [[ ${CHOST} == *-interix[35]* ]]; then
-			epatch "${FILESDIR}"/${P}-interix-network.patch
+			epatch "${FILESDIR}"/${PN}-2.22.3-interix-network.patch
+		fi
+
+		# on interix 6, for some reason, ld segfaults if _REENTRANT is
+		# defined during the gmodule compile.  This kludge turns it off
+		if [[ ${CHOST} == *-interix6* ]]; then
+			epatch "${FILESDIR}"/${P}-interix6-gmodule-no-reentrant.patch
 		fi
 
 		# activate the itx-bind package...
+
 		append-flags "-I${EPREFIX}/usr/include/bind"
 		append-ldflags "-L${EPREFIX}/usr/lib/bind"
 
+		epatch "${FILESDIR}"/${PN}-2.22.3-interix-headers.patch
+
 		AT_M4DIR="m4macros" eautoreconf
 	fi