[patch] Interix 6 API changes, and of course applies the header patch

git-1.6.6.1_ebuild.patch (text/plain), 1.75 KB, created by Greg Turner on 2010-02-05 14:47:03 UTC

--- /opt/gentoo/usr/portage/dev-util/git/git-1.6.6.1.ebuild	2010-01-23 04:31:48 -0800
+++ git-1.6.6.1.ebuild	2010-02-05 06:34:45 -0800
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion multilib
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion multilib flag-o-matic
 [ "$PV" == "9999" ] && inherit git
 
 MY_PV="${PV/_rc/.rc}"
@@ -145,15 +145,18 @@
 		myopts="${myopts} NO_MKSTEMPS=YesPlease"
 	fi
 	if [[ ${CHOST} == *-interix* ]] ; then
-		myopts="${myopts} NO_IPV6=YesPlease"
+		[[ ${CHOST} == *-interix6* ]] || \
+			myopts="${myopts} NO_IPV6=YesPlease"
 		myopts="${myopts} NO_MEMMEM=YesPlease"
 		myopts="${myopts} NO_MKDTEMP=YesPlease"
 		myopts="${myopts} NO_STRTOUMAX=YesPlease"
 		myopts="${myopts} NO_STRTOULL=YesPlease"
-		myopts="${myopts} NO_INET_NTOP=YesPlease"
+		[[ ${CHOST} == *-interix6* ]] || \
+			myopts="${myopts} NO_INET_NTOP=YesPlease"
 		myopts="${myopts} NO_INET_PTON=YesPlease"
 		myopts="${myopts} NO_NSEC=YesPlease"
 		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+		append-flags -D_REENTRANT
 	fi
 	if [[ ${CHOST} == ia64-*-hpux* ]]; then
 		myopts="${myopts} NO_NSEC=YesPlease"
@@ -197,6 +200,7 @@
 	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
 
 	[[ ${CHOST} == *-mint* ]] && epatch "${FILESDIR}"/${PN}-1.6.3.3-mint.patch
+	epatch "${FILESDIR}"/${P}-interix-headers.patch
 
 	# JS install fixup
 	epatch "${FILESDIR}"/git-1.6.6-always-install-js.patch
@@ -385,7 +389,7 @@
 
 	cvs=0
 	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
+	if [[ ${EUID} -eq 0 ]] || [[ ${CHOST} == *-interix* && ${EUID} == 197108 ]]; then
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"