Gentoo Archives: gentoo-commits

From: "Markus Duft (mduft)" <mduft@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/git/files: git-1.7.5-interix.patch
Date: Tue, 31 May 2011 06:27:12
Message-Id: 20110531062702.E760220057@flycatcher.gentoo.org
1 mduft 11/05/31 06:27:02
2
3 Added: git-1.7.5-interix.patch
4 Log:
5 add build fix for x86-interix (prefix)
6
7 (Portage version: 2.1.9.42/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 dev-vcs/git/files/git-1.7.5-interix.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-1.7.5-interix.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-1.7.5-interix.patch?rev=1.1&content-type=text/plain
14
15 Index: git-1.7.5-interix.patch
16 ===================================================================
17 reported upstream: http://thread.gmane.org/gmane.comp.version-control.git/174407/focus=174438
18
19 diff -ru git-1.7.5.rc3.orig/Makefile git-1.7.5.rc3/Makefile
20 --- git-1.7.5.rc3.orig/Makefile 2011-05-27 08:40:59 +0200
21 +++ git-1.7.5.rc3/Makefile 2011-05-27 09:00:58 +0200
22 @@ -1121,8 +1121,6 @@
23 X = .exe
24 endif
25 ifeq ($(uname_S),Interix)
26 - NO_SYS_POLL_H = YesPlease
27 - NO_INTTYPES_H = YesPlease
28 NO_INITGROUPS = YesPlease
29 NO_IPV6 = YesPlease
30 NO_MEMMEM = YesPlease
31 @@ -1133,10 +1131,14 @@
32 ifeq ($(uname_R),3.5)
33 NO_INET_NTOP = YesPlease
34 NO_INET_PTON = YesPlease
35 + NO_SOCKADDR_STORAGE = YesPlease
36 + NO_FNMATCH_CASEFOLD = YesPlease
37 endif
38 ifeq ($(uname_R),5.2)
39 NO_INET_NTOP = YesPlease
40 NO_INET_PTON = YesPlease
41 + NO_SOCKADDR_STORAGE = YesPlease
42 + NO_FNMATCH_CASEFOLD = YesPlease
43 endif
44 endif
45 ifneq (,$(findstring MINGW,$(uname_S)))
46 diff -ru git-1.7.5.rc3.orig/compat/fnmatch/fnmatch.c git-1.7.5.rc3/compat/fnmatch/fnmatch.c
47 --- git-1.7.5.rc3.orig/compat/fnmatch/fnmatch.c 2011-05-27 08:40:57 +0200
48 +++ git-1.7.5.rc3/compat/fnmatch/fnmatch.c 2011-05-27 09:01:47 +0200
49 @@ -127,6 +127,10 @@
50 extern int errno;
51 # endif
52
53 +# ifndef NULL
54 +# define NULL 0
55 +# endif
56 +
57 /* This function doesn't exist on most systems. */
58
59 # if !defined HAVE___STRCHRNUL && !defined _LIBC