diff options
| author |   Markus Duft <mduft@gentoo.org> | 2011-07-13 07:03:15 +0000 |
|---|---|---|
| committer | Markus Duft <mduft@gentoo.org> | 2011-07-13 07:03:15 +0000 |
| commit | 388ecd96987fd97d52abb9db5a836ad60df13b03 (patch) | |
| tree | 1dd0d8bf80e551a6f87f0536db3f73a53eb52bfb /dev-vcs | |
| parent | Add mysql v2 eclass ready for newer mysql 5.1, and supporting mysql/mariadb 5... (diff) | |
| download | gentoo-2-388ecd96987fd97d52abb9db5a836ad60df13b03.tar.gz gentoo-2-388ecd96987fd97d52abb9db5a836ad60df13b03.tar.bz2 gentoo-2-388ecd96987fd97d52abb9db5a836ad60df13b03.zip | |
re-added interix prefix specific patch, as some things didnt make it into the current release.
(Portage version: 2.1.10.3/cvs/Linux i686)
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/git/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-vcs/git/files/git-1.7.6-interix.patch | 29 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.6.ebuild | 4 |
3 files changed, 38 insertions, 2 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index adcd94a6ed6f..4ce698696f3c 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-vcs/git # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.96 2011/06/27 19:56:45 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.97 2011/07/13 07:03:15 mduft Exp $ + + 13 Jul 2011; Markus Duft <mduft@gentoo.org> git-1.7.6.ebuild, + +files/git-1.7.6-interix.patch: + re-added interix prefix specific patch, as some things didnt make it into the + current release. *git-1.7.6 (27 Jun 2011) diff --git a/dev-vcs/git/files/git-1.7.6-interix.patch b/dev-vcs/git/files/git-1.7.6-interix.patch new file mode 100644 index 000000000000..575b0e398d2e --- /dev/null +++ b/dev-vcs/git/files/git-1.7.6-interix.patch @@ -0,0 +1,29 @@ +reported upstream: http://thread.gmane.org/gmane.comp.version-control.git/174407/focus=174438 + +diff -ru git-1.7.5.rc3.orig/Makefile git-1.7.5.rc3/Makefile +--- git-1.7.5.rc3.orig/Makefile 2011-05-27 08:40:59 +0200 ++++ git-1.7.5.rc3/Makefile 2011-05-27 09:00:58 +0200 +@@ -1121,8 +1121,6 @@ + X = .exe + endif + ifeq ($(uname_S),Interix) +- NO_SYS_POLL_H = YesPlease +- NO_INTTYPES_H = YesPlease + NO_INITGROUPS = YesPlease + NO_IPV6 = YesPlease + NO_MEMMEM = YesPlease +@@ -1133,10 +1131,14 @@ + ifeq ($(uname_R),3.5) + NO_INET_NTOP = YesPlease + NO_INET_PTON = YesPlease ++ NO_SOCKADDR_STORAGE = YesPlease ++ NO_FNMATCH_CASEFOLD = YesPlease + endif + ifeq ($(uname_R),5.2) + NO_INET_NTOP = YesPlease + NO_INET_PTON = YesPlease ++ NO_SOCKADDR_STORAGE = YesPlease ++ NO_FNMATCH_CASEFOLD = YesPlease + endif + endif + ifneq (,$(findstring MINGW,$(uname_S))) diff --git a/dev-vcs/git/git-1.7.6.ebuild b/dev-vcs/git/git-1.7.6.ebuild index f1c4de6e2cfe..9ad3457529d7 100644 --- a/dev-vcs/git/git-1.7.6.ebuild +++ b/dev-vcs/git/git-1.7.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.6.ebuild,v 1.1 2011/06/27 19:56:45 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.6.ebuild,v 1.2 2011/07/13 07:03:15 mduft Exp $ EAPI=3 @@ -246,6 +246,8 @@ src_prepare() { # merged upstream #epatch "${FILESDIR}"/git-1.7.5-interix.patch + # but only one of two hunks made it into the release ... :( + epatch "${FILESDIR}"/git-1.7.6-interix.patch } git_emake() { |