The patch doesn't apply to the new 1.7.1 git: >>> Emerging (1 of 1) dev-vcs/git-1.7.1 * git-1.7.1.tar.bz2 RMD160 SHA1 SHA256 size ;-) ... [ ok ] * git-manpages-1.7.1.tar.bz2 RMD160 SHA1 SHA256 size ;-) ... [ ok ] * checking ebuild checksums ;-) ... [ ok ] * checking auxfile checksums ;-) ... [ ok ] * checking miscfile checksums ;-) ... [ ok ] * CPV: dev-vcs/git-1.7.1 * REPO: gentoo_prefix * USE: bash-completion blksha1 curl elibc_Darwin iconv kernel_Darwin perl prefix subversion threads userland_GNU webdav x64-macos >>> Unpacking source... >>> Unpacking git-1.7.1.tar.bz2 to /Volumes/Shared/prefix-64/var/tmp/portage/dev-vcs/git-1.7.1/work >>> Unpacking git-manpages-1.7.1.tar.bz2 to /Volumes/Shared/prefix-64/var/tmp/portage/dev-vcs/git-1.7.1/work/git-1.7.1 >>> Source unpacked in /Volumes/Shared/prefix-64/var/tmp/portage/dev-vcs/git-1.7.1/work >>> Preparing source in /Volumes/Shared/prefix-64/var/tmp/portage/dev-vcs/git-1.7.1/work/git-1.7.1 ... * Applying git-1.7.1-always-install-js.patch ... [ ok ] * Applying git-1.6.6.1-interix.patch ... * Failed Patch: git-1.6.6.1-interix.patch ! * ( /Volumes/Shared/prefix-64/usr/portage/dev-vcs/git/files/git-1.6.6.1-interix.patch ) * * Include in your bugreport the contents of: * * /Volumes/Shared/prefix-64/var/tmp/portage/dev-vcs/git-1.7.1/temp/git-1.6.6.1-interix.patch.out * ERROR: dev-vcs/git-1.7.1 failed: * Failed Patch: git-1.6.6.1-interix.patch! * * Call stack: * ebuild.sh, line 54: Called call-ebuildshell 'src_prepare' * environment, line 437: Called src_prepare * environment, line 3094: Called epatch '/Volumes/Shared/prefix-64/usr/portage/dev-vcs/git/files/git-1.6.6.1-interix.patch' * environment, line 1502: Called die * The specific snippet of code: * die "Failed Patch: ${patchname}!"; * * If you need support, post the output of 'emerge --info =dev-vcs/git-1.7.1', * the complete build log and the output of 'emerge -pqv =dev-vcs/git-1.7.1'. * The complete build log is located at '/Volumes/Shared/prefix-64/var/tmp/portage/dev-vcs/git-1.7.1/temp/build.log'. * The ebuild environment file is located at '/Volumes/Shared/prefix-64/var/tmp/portage/dev-vcs/git-1.7.1/temp/environment'. * S: '/Volumes/Shared/prefix-64/var/tmp/portage/dev-vcs/git-1.7.1/work/git-1.7.1'
Created attachment 230145 [details, diff] apply interix patches in an interix block Since the ebuild already tests for interix hosts, it seemed like a fine method to move the other interix patches there as well
mint != interix and besides that, it's just hiding the real problem.
crap I thought it was :( but looking at the platform matrix I see it isn't Anyway, saw you commented the epatch lines in svn already
yeah, fixing for now
Just change "builtin-upload-archive.c" to "builtin/upload-archive.c" in git-1.6.6.1-interix.patch and the patch will succeed. Failed to emerge without this patch.
need to apply fix as suggested by Shuai WANG
Created attachment 235299 [details, diff] patching interix patch file Reenabled patches, implemented suggested solution I think, needs testing (I don't have any interix available)
reenabled interix patches, thanks
as of a few minutes ago, i re-created the interix patch from ground up, this time more in the spirit of upstream. i submitted the patch against current git-master to upstream too, and hope they'll accept it (as it is absolutely non-intrusive for other platforms).
