{"thread":{"id":"37649","subject":"[PATCH v4] MinGW(-W64) compilation","startedAt":"2014-09-30T07:02:29Z","lastAt":"2014-10-08T13:58:17Z","messageCount":30,"participants":["Marat Radchenko","Duy Nguyen","Johannes Sixt","Junio C Hamano","Thomas Braun","Johannes Schindelin"],"isPatch":true,"patchVersion":4,"patchTotal":null},"messages":[{"id":"250014","messageId":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":null,"subject":"[PATCH v4] MinGW(-W64) compilation","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:29Z","receivedAt":"2014-09-30T07:02:29Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!).\n\n*Compilation* tested on:\n - MSVC\n - msysGit environment (twice)\n - Linux cross-toolchain i686-pc-mingw32\n - Linux cross-toolchain i686-w64-mingw32\n - Linux cross-toolchain x86_64-w64-mingw32\n\nAttention: in order to build on MinGW-W64, you need to use 'v1.x', 'v2.x' or 'sf/v3.x'\nbranches from MinGW-W64 repo because MinGW-W64 releases do not yet have a fix\nfor https://sourceforge.net/p/mingw-w64/bugs/397\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250015","messageId":"1412060563-22041-2-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 01/14] MINGW: compat/mingw.h: do not attempt to redefine lseek on mingw-w64","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:30Z","receivedAt":"2014-09-30T07:02:30Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"Unlike MinGW, MinGW-W64 has lseek already properly defined in io.h.\n\nSigned-off-by: Marat Radchenko \nAcked-by: Eric Faye-Lund \n---\n compat/mingw.h | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/compat/mingw.h b/compat/mingw.h\nindex df0e320..ed79368 100644\n--- a/compat/mingw.h\n+++ b/compat/mingw.h\n@@ -281,7 +281,9 @@ static inline int getrlimit(int resource, struct rlimit *rlp)\n * Use mingw specific stat()/lstat()/fstat() implementations on Windows.\n */\n #define off_t off64_t\n+#ifndef lseek\n #define lseek _lseeki64\n+#endif\n \n /* use struct stat with 64 bit st_size */\n #ifdef stat\n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250016","messageId":"1412060563-22041-3-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 02/14] MSVC: config.mak.uname: drop -D__USE_MINGW_ACCESS from CFLAGS","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:31Z","receivedAt":"2014-09-30T07:02:31Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"-D__USE_MINGW_ACCESS only affects MinGW and does nothing when\nMSVC is used.\n\nSigned-off-by: Marat Radchenko \nAcked-by: Eric Faye-Lund \n---\n config.mak.uname | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/config.mak.uname b/config.mak.uname\nindex a2f380f..20cbdcf 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -368,7 +368,7 @@ ifeq ($(uname_S),Windows)\n \tCOMPAT_OBJS = compat/msvc.o compat/winansi.o \\\n \t\tcompat/win32/pthread.o compat/win32/syslog.o \\\n \t\tcompat/win32/dirent.o\n-\tCOMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\\\".exe\\\"\n+\tCOMPAT_CFLAGS = -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\\\".exe\\\"\n \tBASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE\n \tEXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj\n \tPTHREAD_LIBS =\n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250017","messageId":"1412060563-22041-4-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 03/14] MINGW: compat/mingw.h: drop fork() definition","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:32Z","receivedAt":"2014-09-30T07:02:32Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"fork() is not used in MinGW builds but causes a compiler warning\non x86_64 MinGW-W64: conflicting types for built-in function 'fork'\n\nSigned-off-by: Marat Radchenko \nAcked-by: Eric Faye-Lund \n---\n compat/mingw.h | 2 --\n 1 file changed, 2 deletions(-)\n\ndiff --git a/compat/mingw.h b/compat/mingw.h\nindex ed79368..948a174 100644\n--- a/compat/mingw.h\n+++ b/compat/mingw.h\n@@ -93,8 +93,6 @@ static inline int symlink(const char *oldpath, const char *newpath)\n { errno = ENOSYS; return -1; }\n static inline int fchmod(int fildes, mode_t mode)\n { errno = ENOSYS; return -1; }\n-static inline pid_t fork(void)\n-{ errno = ENOSYS; return -1; }\n static inline unsigned int alarm(unsigned int seconds)\n { return 0; }\n static inline int fsync(int fd)\n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250018","messageId":"1412060563-22041-5-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 04/14] MINGW: do not fail at redefining pid_t on MinGW-W64","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:33Z","receivedAt":"2014-09-30T07:02:33Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"pid_t is available in sys/types.h on both MinGW and MinGW-W64\n\nSigned-off-by: Marat Radchenko \nAcked-by: Eric Faye-Lund \n---\n compat/mingw.h | 1 -\n compat/msvc.h | 2 ++\n 2 files changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/compat/mingw.h b/compat/mingw.h\nindex 948a174..d113b19 100644\n--- a/compat/mingw.h\n+++ b/compat/mingw.h\n@@ -5,7 +5,6 @@\n * things that are not available in header files\n */\n \n-typedef int pid_t;\n typedef int uid_t;\n typedef int socklen_t;\n #define hstrerror strerror\ndiff --git a/compat/msvc.h b/compat/msvc.h\nindex 580bb55..a63d878 100644\n--- a/compat/msvc.h\n+++ b/compat/msvc.h\n@@ -15,6 +15,8 @@\n #define strtoull _strtoui64\n #define strtoll _strtoi64\n \n+typedef int pid_t;\n+\n static __inline int strcasecmp (const char *s1, const char *s2)\n {\n \tint size1 = strlen(s1);\n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250019","messageId":"1412060563-22041-6-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 05/14] MINGW: config.mak.uname: allow using cURL for non-msysGit builds","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:34Z","receivedAt":"2014-09-30T07:02:34Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"Is it absolutely valid and possible to have cURL in generic\nMinGW environment. Building Git without cURL is still possible\nby passing NO_CURL=1\n\nSigned-off-by: Marat Radchenko \nAcked-by: Eric Faye-Lund \n---\n config.mak.uname | 2 --\n 1 file changed, 2 deletions(-)\n\ndiff --git a/config.mak.uname b/config.mak.uname\nindex 20cbdcf..324a7fc 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -531,8 +531,6 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))\n \tINTERNAL_QSORT = YesPlease\n \tHAVE_LIBCHARSET_H = YesPlease\n \tNO_GETTEXT = YesPlease\n-else\n-\tNO_CURL = YesPlease\n endif\n endif\n ifeq ($(uname_S),QNX)\n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250020","messageId":"1412060563-22041-7-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 06/14] MINGW: compat/winansi.c: do not redefine CONSOLE_FONT_INFOEX","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:35Z","receivedAt":"2014-09-30T07:02:35Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"Unlike MinGW, MinGW-W64 has CONSOLE_FONT_INFOEX already properly defined\nin wincon.h.\n\nSigned-off-by: Marat Radchenko \n---\n compat/winansi.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/compat/winansi.c b/compat/winansi.c\nindex efc5bb3..0ac3297 100644\n--- a/compat/winansi.c\n+++ b/compat/winansi.c\n@@ -22,7 +22,7 @@ static int non_ascii_used = 0;\n static HANDLE hthread, hread, hwrite;\n static HANDLE hconsole1, hconsole2;\n \n-#ifdef __MINGW32__\n+#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)\n typedef struct _CONSOLE_FONT_INFOEX {\n \tULONG cbSize;\n \tDWORD nFont;\n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250023","messageId":"1412060563-22041-8-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 07/14] Fix BASIC_LDFLAGS and COMPAT_CFLAGS for 64bit MinGW-w64","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:36Z","receivedAt":"2014-09-30T07:02:36Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"From: Ray Donnelly \n\nSigned-off-by: Ray Donnelly \nSigned-off-by: Marat Radchenko \n---\n config.mak.uname | 8 ++++++--\n 1 file changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/config.mak.uname b/config.mak.uname\nindex 324a7fc..4470a928 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -6,6 +6,7 @@ uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')\n uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')\n uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')\n uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')\n+CC_MACH := $(shell sh -c '$(CC) -dumpmachine 2>/dev/null || echo not')\n \n ifdef MSVC\n \t# avoid the MingW and Cygwin configuration sections\n@@ -509,12 +510,15 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n \tNO_POSIX_GOODIES = UnfortunatelyYes\n \tDEFAULT_HELP_FORMAT = html\n \tNO_D_INO_IN_DIRENT = YesPlease\n-\tCOMPAT_CFLAGS += -D__USE_MINGW_ACCESS -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32\n+\tCOMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/win32\n+\tifneq (,$(findstring i686,$(CC_MACH)))\n+\t\tCOMPAT_CFLAGS += -D_USE_32BIT_TIME_T\n+\t\tBASIC_LDFLAGS += -Wl,--large-address-aware\n+\tendif\n \tCOMPAT_CFLAGS += -DSTRIP_EXTENSION=\\\".exe\\\"\n \tCOMPAT_OBJS += compat/mingw.o compat/winansi.o \\\n \t\tcompat/win32/pthread.o compat/win32/syslog.o \\\n \t\tcompat/win32/dirent.o\n-\tBASIC_LDFLAGS += -Wl,--large-address-aware\n \tEXTLIBS += -lws2_32\n \tGITLIBS += git.res\n \tPTHREAD_LIBS =\n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250022","messageId":"1412060563-22041-9-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 08/14] MINGW: git-compat-util.h: use inttypes.h for printf macros","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:37Z","receivedAt":"2014-09-30T07:02:37Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"All MinGW flavors have inttypes.h, so just include it.\n\nHowever, we need to pass -D__USE_MINGW_ANSI_STDIO=1 to select\nGNU-compatible macro definitions on MinGW-W64:\nhttp://sourceforge.net/p/mingw-w64/wiki2/gnu%20printf/\n\nAs a side-effect, Git no longer builds with MSVC < 2010 due to\nits lack of stdint.h but hopefully that is not a problem.\n\nSigned-off-by: Marat Radchenko \n---\n compat/mingw.h | 2 --\n compat/msvc.h | 3 +++\n config.mak.uname | 3 ++-\n git-compat-util.h | 11 ++++++-----\n 4 files changed, 11 insertions(+), 8 deletions(-)\n\ndiff --git a/compat/mingw.h b/compat/mingw.h\nindex d113b19..4bae842 100644\n--- a/compat/mingw.h\n+++ b/compat/mingw.h\n@@ -353,8 +353,6 @@ static inline char *mingw_find_last_dir_sep(const char *path)\n int mingw_offset_1st_component(const char *path);\n #define offset_1st_component mingw_offset_1st_component\n #define PATH_SEP ';'\n-#define PRIuMAX \"I64u\"\n-#define PRId64 \"I64d\"\n \n void mingw_open_html(const char *path);\n #define open_html mingw_open_html\ndiff --git a/compat/msvc.h b/compat/msvc.h\nindex a63d878..84a03f9 100644\n--- a/compat/msvc.h\n+++ b/compat/msvc.h\n@@ -17,6 +17,9 @@\n \n typedef int pid_t;\n \n+#define PRIuMAX \"I64u\"\n+#define PRId64 \"I64d\"\n+\n static __inline int strcasecmp (const char *s1, const char *s2)\n {\n \tint size1 = strlen(s1);\ndiff --git a/config.mak.uname b/config.mak.uname\nindex 4470a928..c7aaa1c 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -328,6 +328,7 @@ ifeq ($(uname_S),Windows)\n \tNO_PREAD = YesPlease\n \tNEEDS_CRYPTO_WITH_SSL = YesPlease\n \tNO_LIBGEN_H = YesPlease\n+\tNO_INTTYPES_H = UnfortunatelyYes\n \tNO_POLL = YesPlease\n \tNO_SYMLINK_HEAD = YesPlease\n \tNO_IPV6 = YesPlease\n@@ -510,7 +511,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n \tNO_POSIX_GOODIES = UnfortunatelyYes\n \tDEFAULT_HELP_FORMAT = html\n \tNO_D_INO_IN_DIRENT = YesPlease\n-\tCOMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/win32\n+\tCOMPAT_CFLAGS += -D__USE_MINGW_ACCESS -D__USE_MINGW_ANSI_STDIO=1 -DNOGDI -Icompat -Icompat/win32\n \tifneq (,$(findstring i686,$(CC_MACH)))\n \t\tCOMPAT_CFLAGS += -D_USE_32BIT_TIME_T\n \t\tBASIC_LDFLAGS += -Wl,--large-address-aware\ndiff --git a/git-compat-util.h b/git-compat-util.h\nindex 0c4e663..9d2d5ab 100644\n--- a/git-compat-util.h\n+++ b/git-compat-util.h\n@@ -96,6 +96,12 @@\n #define GIT_WINDOWS_NATIVE\n #endif\n \n+#ifndef NO_INTTYPES_H\n+#include \n+#else\n+#include \n+#endif\n+\n #include \n #include \n #include \n@@ -147,11 +153,6 @@\n #include \n #include \n #include \n-#ifndef NO_INTTYPES_H\n-#include \n-#else\n-#include \n-#endif\n #ifdef NO_INTPTR_T\n /*\n * On I16LP32, ILP32 and LP64 \"long\" is the save bet, however\n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250021","messageId":"1412060563-22041-10-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 09/14] MINGW: config.mak.uname: reorganize MinGW settings","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:38Z","receivedAt":"2014-09-30T07:02:38Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"HAVE_LIBCHARSET_H and NO_R_TO_GCC_LINKER are not specific to\nmsysGit, they're general MinGW settings.\n\nLogic behind HAVE_LIBCHARSET_H: if user is on MinGW and has iconv,\nwe expect him to have libcharset.h. If user doesn't have iconv,\nhe has to explicitly say so via NO_ICONV=1 regardless of this\ncommit.\n\nSigned-off-by: Marat Radchenko \n---\n config.mak.uname | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/config.mak.uname b/config.mak.uname\nindex c7aaa1c..f79c0e0 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -532,11 +532,11 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))\n \tprefix =\n \tINSTALL = /bin/install\n \tEXTLIBS += /mingw/lib/libz.a\n-\tNO_R_TO_GCC_LINKER = YesPlease\n \tINTERNAL_QSORT = YesPlease\n-\tHAVE_LIBCHARSET_H = YesPlease\n \tNO_GETTEXT = YesPlease\n endif\n+\tHAVE_LIBCHARSET_H = YesPlease\n+\tNO_R_TO_GCC_LINKER = YesPlease\n endif\n ifeq ($(uname_S),QNX)\n \tCOMPAT_CFLAGS += -DSA_RESTART=0\n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250028","messageId":"1412060563-22041-11-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 10/14] Makefile: introduce CROSS_COMPILE variable","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:39Z","receivedAt":"2014-09-30T07:02:39Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"To ease cross-compilation process, introduce a single variable\nwith the prefix to all compiler-related executables.\n\nDefine CROSS_COMPILE=foo- if your compiler and binary utilities\nare foo-cc, foo-ar, foo-strip, etc. More specific variables\noverride this, so if you set CC=gcc CROSS_COMPILE=ia64-linux-gnu-\nthen the compiler will be 'gcc', not 'ia64-linux-gnu-gcc'.\n\nSigned-off-by: Marat Radchenko \n---\n Makefile | 19 +++++++++++++------\n config.mak.uname | 2 +-\n 2 files changed, 14 insertions(+), 7 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex f34a2d4..c412996 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -339,6 +339,11 @@ all::\n # return NULL when it receives a bogus time_t.\n #\n # Define HAVE_CLOCK_GETTIME if your platform has clock_gettime in librt.\n+#\n+# Define CROSS_COMPILE=foo- if your compiler and binary utilities\n+# are foo-cc, foo-ar, foo-strip, etc. More specific variables\n+# override this, so if you set CC=gcc CROSS_COMPILE=ia64-linux-gnu-\n+# then the compiler will be 'gcc', not 'ia64-linux-gnu-gcc'.\n \n GIT-VERSION-FILE: FORCE\n \t@$(SHELL_PATH) ./GIT-VERSION-GEN\n@@ -350,7 +355,6 @@ CFLAGS = -g -O2 -Wall\n LDFLAGS =\n ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)\n ALL_LDFLAGS = $(LDFLAGS)\n-STRIP ?= strip\n \n # Among the variables below, these:\n # gitexecdir\n@@ -390,8 +394,12 @@ htmldir_relative = $(patsubst $(prefix)/%,%,$(htmldir))\n \n export prefix bindir sharedir sysconfdir gitwebdir localedir\n \n-CC = cc\n-AR = ar\n+AR = $(CROSS_COMPILE)ar\n+CC = $(CROSS_COMPILE)cc\n+GCOV = $(CROSS_COMPILE)gcov\n+RC = $(CROSS_COMPILE)windres\n+STRIP = $(CROSS_COMPILE)strip\n+\n RM = rm -f\n DIFF = diff\n TAR = tar\n@@ -404,13 +412,12 @@ XGETTEXT = xgettext\n MSGFMT = msgfmt\n PTHREAD_LIBS = -lpthread\n PTHREAD_CFLAGS =\n-GCOV = gcov\n \n export TCL_PATH TCLTK_PATH\n \n SPARSE_FLAGS =\n \n-\n+RCFLAGS =\n \n ### --- END CONFIGURATION SECTION ---\n \n@@ -1669,7 +1676,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES\n \tmv $@+ $@\n \n git.res: git.rc GIT-VERSION-FILE\n-\t$(QUIET_RC)$(RC) \\\n+\t$(QUIET_RC)$(RC) $(RCFLAGS) \\\n \t $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \\\n \t -DGIT_VERSION=\"\\\\\\\"$(GIT_VERSION)\\\\\\\"\" $< -o $@\n \ndiff --git a/config.mak.uname b/config.mak.uname\nindex f79c0e0..9f7037e 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -523,7 +523,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))\n \tEXTLIBS += -lws2_32\n \tGITLIBS += git.res\n \tPTHREAD_LIBS =\n-\tRC = windres -O coff\n+\tRCFLAGS += -O coff\n \tNATIVE_CRLF = YesPlease\n \tX = .exe\n \tSPARSE_FLAGS = -Wno-one-bit-signed-bitfield\n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250025","messageId":"1412060563-22041-12-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 11/14] compat/nedmalloc/malloc.c.h: fix compilation under MinGW-W64","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:40Z","receivedAt":"2014-09-30T07:02:40Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"1. Unlike MinGW, MinGW-W64 already provides _ReadWriteBarrier macro,\n so don't try to redefine it.\n\n2. MinGW-W64 has a strange definition FORCEINLINE as\n extern __inline__ __attribute__((__always_inline__,__gnu_inline__))\n\n 'extern' doesn't work together with 'static', so #undef MinGW-W64\n version of FORCEINLINE.\n\nSigned-off-by: Marat Radchenko \n---\n compat/nedmalloc/malloc.c.h | 8 +++++++-\n 1 file changed, 7 insertions(+), 1 deletion(-)\n\ndiff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h\nindex f216a2a..a6c8cac 100644\n--- a/compat/nedmalloc/malloc.c.h\n+++ b/compat/nedmalloc/malloc.c.h\n@@ -715,6 +715,10 @@ struct mallinfo {\n #endif /* HAVE_USR_INCLUDE_MALLOC_H */\n #endif /* NO_MALLINFO */\n \n+#ifdef __MINGW64_VERSION_MAJOR\n+ #undef FORCEINLINE\n+#endif\n+\n /*\n Try to persuade compilers to inline. The most critical functions for\n inlining are defined as macros, so these aren't used for them.\n@@ -1382,7 +1386,9 @@ LONG __cdecl _InterlockedExchange(LONG volatile *Target, LONG Value);\n \n /*** Atomic operations ***/\n #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100\n- #define _ReadWriteBarrier() __sync_synchronize()\n+ #ifndef _ReadWriteBarrier\n+ #define _ReadWriteBarrier() __sync_synchronize()\n+ #endif\n #else\n static __inline__ __attribute__((always_inline)) long __sync_lock_test_and_set(volatile long * const Target, const long Value)\n {\n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250027","messageId":"1412060563-22041-13-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 12/14] Fix pointer -> integer casts on IL32P64 systems","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:41Z","receivedAt":"2014-09-30T07:02:41Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"This commit touches regcomp.c and poll.c from Gnulib,\nboth were fixed upstream in 2012 the same way.\n\nAlso, this commit touches regex_internal.h from Gnulib,\nwhich was fixed upstream in 2005.\n\nWrt ShellExecute in winansi.c, quoting [1]:\n\n MSDN says you can cast the result to an integer and compare the result\n against 32... You could cast in the other direction, comparing the return\n value against (HINSTANCE)32... Or you could cast the result to an INT_PTR\n and compare the result against 32.\n\nWe use the third option: cast HINSTANCE to intptr_t.\n\n[1]: http://blogs.msdn.com/b/oldnewthing/archive/2006/11/08/1035971.aspx\n\nSigned-off-by: Marat Radchenko \n---\n compat/mingw.c | 8 ++++----\n compat/poll/poll.c | 2 +-\n compat/regex/regcomp.c | 4 ++--\n compat/regex/regex_internal.h | 1 +\n compat/win32/pthread.h | 2 +-\n compat/winansi.c | 2 +-\n pack-revindex.c | 2 +-\n sha1_file.c | 8 ++++----\n 8 files changed, 15 insertions(+), 14 deletions(-)\n\ndiff --git a/compat/mingw.c b/compat/mingw.c\nindex c5c37e5..27925d9 100644\n--- a/compat/mingw.c\n+++ b/compat/mingw.c\n@@ -674,13 +674,13 @@ int pipe(int filedes[2])\n \t\terrno = err_win_to_posix(GetLastError());\n \t\treturn -1;\n \t}\n-\tfiledes[0] = _open_osfhandle((int)h[0], O_NOINHERIT);\n+\tfiledes[0] = _open_osfhandle((intptr_t)h[0], O_NOINHERIT);\n \tif (filedes[0] < 0) {\n \t\tCloseHandle(h[0]);\n \t\tCloseHandle(h[1]);\n \t\treturn -1;\n \t}\n-\tfiledes[1] = _open_osfhandle((int)h[1], O_NOINHERIT);\n+\tfiledes[1] = _open_osfhandle((intptr_t)h[1], O_NOINHERIT);\n \tif (filedes[0] < 0) {\n \t\tclose(filedes[0]);\n \t\tCloseHandle(h[1]);\n@@ -1819,7 +1819,7 @@ void mingw_open_html(const char *unixpath)\n \t\t\tconst char *, const char *, const char *, INT);\n \tT ShellExecute;\n \tHMODULE shell32;\n-\tint r;\n+\tintptr_t r;\n \n \tshell32 = LoadLibrary(\"shell32.dll\");\n \tif (!shell32)\n@@ -1829,7 +1829,7 @@ void mingw_open_html(const char *unixpath)\n \t\tdie(\"cannot run browser\");\n \n \tprintf(\"Launching default browser to display HTML ...\\n\");\n-\tr = (int)ShellExecute(NULL, \"open\", htmlpath, NULL, \"\\\\\", SW_SHOWNORMAL);\n+\tr = (intptr_t)ShellExecute(NULL, \"open\", htmlpath, NULL, \"\\\\\", SW_SHOWNORMAL);\n \tFreeLibrary(shell32);\n \t/* see the MSDN documentation referring to the result codes here */\n \tif (r <= 32) {\ndiff --git a/compat/poll/poll.c b/compat/poll/poll.c\nindex a9b41d8..8941249 100644\n--- a/compat/poll/poll.c\n+++ b/compat/poll/poll.c\n@@ -76,7 +76,7 @@\n \n #ifdef WIN32_NATIVE\n \n-#define IsConsoleHandle(h) (((long) (h) & 3) == 3)\n+#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3)\n \n static BOOL\n IsSocketHandle (HANDLE h)\ndiff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c\nindex 06f3088..d8bde06 100644\n--- a/compat/regex/regcomp.c\n+++ b/compat/regex/regcomp.c\n@@ -2577,7 +2577,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,\n old_tree = NULL;\n \n if (elem->token.type == SUBEXP)\n- postorder (elem, mark_opt_subexp, (void *) (long) elem->token.opr.idx);\n+ postorder (elem, mark_opt_subexp, (void *) (intptr_t) elem->token.opr.idx);\n \n tree = create_tree (dfa, elem, NULL, (end == -1 ? OP_DUP_ASTERISK : OP_ALT));\n if (BE (tree == NULL, 0))\n@@ -3806,7 +3806,7 @@ create_token_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,\n static reg_errcode_t\n mark_opt_subexp (void *extra, bin_tree_t *node)\n {\n- int idx = (int) (long) extra;\n+ int idx = (int) (intptr_t) extra;\n if (node->token.type == SUBEXP && node->token.opr.idx == idx)\n node->token.opt_subexp = 1;\n \ndiff --git a/compat/regex/regex_internal.h b/compat/regex/regex_internal.h\nindex 4184d7f..da12670 100644\n--- a/compat/regex/regex_internal.h\n+++ b/compat/regex/regex_internal.h\n@@ -26,6 +26,7 @@\n #include \n #include \n #include \n+#include \n \n #if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC\n # include \ndiff --git a/compat/win32/pthread.h b/compat/win32/pthread.h\nindex 8ad1873..6ccfb7b 100644\n--- a/compat/win32/pthread.h\n+++ b/compat/win32/pthread.h\n@@ -77,7 +77,7 @@ extern pthread_t pthread_self(void);\n \n static inline int pthread_exit(void *ret)\n {\n-\tExitThread((DWORD)ret);\n+\tExitThread((DWORD)(uintptr_t)ret);\n }\n \n typedef DWORD pthread_key_t;\ndiff --git a/compat/winansi.c b/compat/winansi.c\nindex 0ac3297..ca4c295 100644\n--- a/compat/winansi.c\n+++ b/compat/winansi.c\n@@ -452,7 +452,7 @@ static HANDLE duplicate_handle(HANDLE hnd)\n \tHANDLE hresult, hproc = GetCurrentProcess();\n \tif (!DuplicateHandle(hproc, hnd, hproc, &hresult, 0, TRUE,\n \t\t\tDUPLICATE_SAME_ACCESS))\n-\t\tdie_lasterr(\"DuplicateHandle(%li) failed\", (long) hnd);\n+\t\tdie_lasterr(\"DuplicateHandle(%p) failed\", hnd);\n \treturn hresult;\n }\n \ndiff --git a/pack-revindex.c b/pack-revindex.c\nindex 5c8376e..df02e9f 100644\n--- a/pack-revindex.c\n+++ b/pack-revindex.c\n@@ -21,7 +21,7 @@ static int pack_revindex_hashsz;\n \n static int pack_revindex_ix(struct packed_git *p)\n {\n-\tunsigned long ui = (unsigned long)p;\n+\tuintptr_t ui = (uintptr_t)p;\n \tint i;\n \n \tui = ui ^ (ui >> 16); /* defeat structure alignment */\ndiff --git a/sha1_file.c b/sha1_file.c\nindex c08c0cb..a534fda 100644\n--- a/sha1_file.c\n+++ b/sha1_file.c\n@@ -1966,11 +1966,11 @@ static struct delta_base_cache_entry {\n \tenum object_type type;\n } delta_base_cache[MAX_DELTA_CACHE];\n \n-static unsigned long pack_entry_hash(struct packed_git *p, off_t base_offset)\n+static uintptr_t pack_entry_hash(struct packed_git *p, off_t base_offset)\n {\n-\tunsigned long hash;\n+\tuintptr_t hash;\n \n-\thash = (unsigned long)p + (unsigned long)base_offset;\n+\thash = (uintptr_t)p + base_offset;\n \thash += (hash >> 8) + (hash >> 16);\n \treturn hash % MAX_DELTA_CACHE;\n }\n@@ -1978,7 +1978,7 @@ static unsigned long pack_entry_hash(struct packed_git *p, off_t base_offset)\n static struct delta_base_cache_entry *\n get_delta_base_cache_entry(struct packed_git *p, off_t base_offset)\n {\n-\tunsigned long hash = pack_entry_hash(p, base_offset);\n+\tuintptr_t hash = pack_entry_hash(p, base_offset);\n \treturn delta_base_cache + hash;\n }\n \n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250026","messageId":"1412060563-22041-14-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 13/14] git-compat-util.h: fix integer overflow on IL32P64 systems","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:42Z","receivedAt":"2014-09-30T07:02:42Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"Signed-off-by: Marat Radchenko \n---\n git-compat-util.h | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-compat-util.h b/git-compat-util.h\nindex 9d2d5ab..5f6659c 100644\n--- a/git-compat-util.h\n+++ b/git-compat-util.h\n@@ -474,7 +474,7 @@ extern int git_munmap(void *start, size_t length);\n #endif\n \n #define DEFAULT_PACKED_GIT_LIMIT \\\n-\t((1024L * 1024L) * (sizeof(void*) >= 8 ? 8192 : 256))\n+\t((size_t)(1024L * 1024L) * (sizeof(void*) >= 8 ? 8192 : 256))\n \n #ifdef NO_PREAD\n #define pread git_pread\n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250024","messageId":"1412060563-22041-15-git-send-email-marat@slonopotamus.org","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"[PATCH 14/14] MINGW: config.mak.uname: auto-detect MinGW build from compiler","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-09-30T07:02:43Z","receivedAt":"2014-09-30T07:02:43Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"When crosscompiling, one cannot rely on `uname` from host system.\n\nSigned-off-by: Marat Radchenko \n---\n config.mak.uname | 5 +++++\n 1 file changed, 5 insertions(+)\n\ndiff --git a/config.mak.uname b/config.mak.uname\nindex 9f7037e..182da50 100644\n--- a/config.mak.uname\n+++ b/config.mak.uname\n@@ -14,6 +14,11 @@ ifdef MSVC\n \tuname_O := Windows\n endif\n \n+ifneq (,$(findstring mingw,$(CC_MACH)))\n+\tuname_S := MINGW\n+\tuname_O := MINGW\n+endif\n+\n # We choose to avoid \"if .. else if .. else .. endif endif\"\n # because maintaining the nesting to match is a pain. If\n # we had \"elif\" things would have been much nicer...\n-- \n2.1.1\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250031","messageId":"CACsJy8CTJUZxxxQqPJTNzt7YTZJZgfoNjhkb2Z--jJZjyMDYaQ@mail.gmail.com","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2014-09-30T10:10:03Z","receivedAt":"2014-09-30T10:10:03Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Tue, Sep 30, 2014 at 2:02 PM, Marat Radchenko wrote:\n> This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!).\n>\n> *Compilation* tested on:\n> - MSVC\n> - msysGit environment (twice)\n> - Linux cross-toolchain i686-pc-mingw32\n\nThanks. I always wanted to do this but never got around to clean up\nand submit. There's a problem with include order in Makefile. I don't\nwant to specify CROSS_COMPILE or CC=mingw32-gcc from command line any\ntime I make a build, so I put all those in config.mak. But because\nthis file is included after config.mak.uname, all the default settings\nfor MINGW is ignored.\n\nI'm not sure if we can move config.mak up before config.mak.uname. If\nwe can't I'm ok with including a new file (config.mak.pre or\nsomething) before config.mak.uname. That would make \"make\" (no\narguments) work for me.\n-- \nDuy\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250265","messageId":"20141006051707.GA23305@seldon","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-10-06T05:17:07Z","receivedAt":"2014-10-06T05:17:07Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote:\n> This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!).\n\nJunio, ping?\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250271","messageId":"5432E45A.8000208@kdbg.org","threadId":"37649","inReplyTo":"20141006051707.GA23305@seldon","subject":"Re: Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2014-10-06T18:50:02Z","receivedAt":"2014-10-06T18:50:02Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 06.10.2014 um 07:17 schrieb Marat Radchenko:\n> On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote:\n>> This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!).\n> \n> Junio, ping?\n> \n\nSorry, I forgot to report that this updated series works now for me.\n\nThe patches all look reasonable. I don't have an opinion on the\nrestriction that MSVC < 2010 can't be used anymore (path 08/14).\n\n-- Hannes\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250301","messageId":"xmqqvbnvemak.fsf@gitster.dls.corp.google.com","threadId":"37649","inReplyTo":"5432E45A.8000208@kdbg.org","subject":"Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-10-07T19:01:55Z","receivedAt":"2014-10-07T19:01:55Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Sixt writes:\n\n> Am 06.10.2014 um 07:17 schrieb Marat Radchenko:\n>> On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote:\n>>> This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!).\n>> \n>> Junio, ping?\n>> \n>\n> Sorry, I forgot to report that this updated series works now for me.\n>\n> The patches all look reasonable. I don't have an opinion on the\n> restriction that MSVC < 2010 can't be used anymore (path 08/14).\n\nSo, is that an Ack, or would you prefer to cook this first in\nmsysgit tree and then feed the result as part of \"This series is to\nshrink the difference between the mainline and msysgit\" later?\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250308","messageId":"543445B9.508@kdbg.org","threadId":"37649","inReplyTo":"xmqqvbnvemak.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2014-10-07T19:57:45Z","receivedAt":"2014-10-07T19:57:45Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 07.10.2014 um 21:01 schrieb Junio C Hamano:\n> Johannes Sixt writes:\n> \n>> Am 06.10.2014 um 07:17 schrieb Marat Radchenko:\n>>> On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote:\n>>>> This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!).\n>>>\n>>> Junio, ping?\n>>>\n>>\n>> Sorry, I forgot to report that this updated series works now for me.\n>>\n>> The patches all look reasonable. I don't have an opinion on the\n>> restriction that MSVC < 2010 can't be used anymore (path 08/14).\n> \n> So, is that an Ack, or would you prefer to cook this first in\n> msysgit tree and then feed the result as part of \"This series is to\n> shrink the difference between the mainline and msysgit\" later?\n\nAt this time, it's really just a \"works for me\" report, because I didn't\nlook carefully at each patch. I may do that at some time later.\n\nIf someone from the msysgit crew (I don't count myself to it) could\nreport \"works for us, too\", then the series could go into your tree\nright away, in my opinion.\n\n-- Hannes\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250327","messageId":"543472A0.3020401@virtuell-zuhause.de","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Thomas Braun","fromEmail":"thomas.braun@virtuell-zuhause.de","sentAt":"2014-10-07T23:09:20Z","receivedAt":"2014-10-07T23:09:20Z","isPatch":true,"sender":{"key":"thomas.braun@virtuell-zuhause.de","avatar":"https://avatars.githubusercontent.com/u/1185677?v=4"},"body":"Am 30.09.2014 um 09:02 schrieb Marat Radchenko:\n> This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!).\n> \n> *Compilation* tested on:\n> - MSVC\n> - msysGit environment (twice)\n\nHi Marat,\n\nI wanted to verify that on msysgit but some patches fail to apply\ncleanly. Did you also had to tweak the patches?\nIf yes, are these tweaked patches still available somewhere?\n\nThomas\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250329","messageId":"20141008045330.GA5672@seldon","threadId":"37649","inReplyTo":"543472A0.3020401@virtuell-zuhause.de","subject":"Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-10-08T04:53:30Z","receivedAt":"2014-10-08T04:53:30Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"On Wed, Oct 08, 2014 at 01:09:20AM +0200, Thomas Braun wrote:\n> Am 30.09.2014 um 09:02 schrieb Marat Radchenko:\n> > This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!).\n> > \n> > *Compilation* tested on:\n> > - MSVC\n> > - msysGit environment (twice)\n> \n> Hi Marat,\n> \n> I wanted to verify that on msysgit but some patches fail to apply\n> cleanly. Did you also had to tweak the patches?\n> If yes, are these tweaked patches still available somewhere?\n\nmsysgit != git-for-windows, as msysgit folks say. msysgit is a development\nenvironment for git-for-windows.\n\nI tested my patches by applying them to git.git/master and building\ninside msysgit.\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250343","messageId":"alpine.DEB.1.00.1410081055320.990@s15462909.onlinehome-server.info","threadId":"37649","inReplyTo":"20141008045330.GA5672@seldon","subject":"Re: Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2014-10-08T08:59:57Z","receivedAt":"2014-10-08T08:59:57Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Marat,\n\nOn Wed, 8 Oct 2014, Marat Radchenko wrote:\n\n> On Wed, Oct 08, 2014 at 01:09:20AM +0200, Thomas Braun wrote:\n>\n> > I wanted to verify that on msysgit but some patches fail to apply\n> > cleanly. Did you also had to tweak the patches?\n> > If yes, are these tweaked patches still available somewhere?\n> \n> msysgit != git-for-windows, as msysgit folks say.\n\nThat's not what msysgit folks say (they say that msysgit is the\ndevelopment environment to build Git for Windows [*1*]), and Thomas is\nwell aware of the situation because he is a busy contributor on the\nWindows side.\n\n> I tested my patches by applying them to git.git/master and building\n> inside msysgit.\n\nSo the idea would be to rebase from git/git/master onto\nmsysgit/git/master. Did you do that yet?\n\nCiao,\nJohannes\n\nFootnote *1*: msysgit is about to be phased out. As soon as\nhttps://github.com/git-for-windows/sdk is able to produce a Git for\nWindows installer (it already able to build Git and pass the test suite),\nwe will switch to the new development environment and mark msysgit as\nobsolete, keeping it around only for reference.\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250346","messageId":"20141008093258.GA6393@seldon","threadId":"37649","inReplyTo":"alpine.DEB.1.00.1410081055320.990@s15462909.onlinehome-server.info","subject":"Re: Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-10-08T09:32:58Z","receivedAt":"2014-10-08T09:32:58Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"On Wed, Oct 08, 2014 at 10:59:57AM +0200, Johannes Schindelin wrote:\n> Hi Marat,\n> \n> On Wed, 8 Oct 2014, Marat Radchenko wrote:\n> \n> That's not what msysgit folks say (they say that msysgit is the\n> development environment to build Git for Windows [*1*]).\n\nAaargh! msys != msysgit != Git for Windows SDK != Git for Windows != mingwGitDevEnv\nand possibly != git-for-windows.\n\nOh, there's also mingw-w64-git from msys2 [1].\n\n> > I tested my patches by applying them to git.git/master and building\n> > inside msysgit.\n> \n> So the idea would be to rebase from git/git/master onto\n> msysgit/git/master. Did you do that yet?\n\nNo, what for? Windows flavors of Git are already fragmented too much,\nmy patchset is deliberately targeted at Git upstream.\n\n[1] https://github.com/Alexpux/MINGW-packages/tree/master/mingw-w64-git\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250347","messageId":"alpine.DEB.1.00.1410081129401.990@s15462909.onlinehome-server.info","threadId":"37649","inReplyTo":"543472A0.3020401@virtuell-zuhause.de","subject":"Re: Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2014-10-08T09:35:11Z","receivedAt":"2014-10-08T09:35:11Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Thomas,\n\nOn Wed, 8 Oct 2014, Thomas Braun wrote:\n\n> I wanted to verify that on msysgit but some patches fail to apply\n> cleanly. Did you also had to tweak the patches?\n\nI applied the patches to git-for-windows/git's master, manually fixing\nthree of them, and pushed the result to the 'w64' branch in my fork.\nPlease find them here:\n\n\thttps://github.com/dscho/git/compare/git-for-windows:master...w64\n\nand rebased onto msysgit's master:\n\n\thttps://github.com/dscho/git/compare/msysgit:master...w64-msysgit\n\nCiao,\nDscho\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250348","messageId":"alpine.DEB.1.00.1410081139330.990@s15462909.onlinehome-server.info","threadId":"37649","inReplyTo":"1412060563-22041-1-git-send-email-marat@slonopotamus.org","subject":"Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2014-10-08T09:40:17Z","receivedAt":"2014-10-08T09:40:17Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi all,\n\nOn Tue, 30 Sep 2014, Marat Radchenko wrote:\n\n> This patch series fixes building on modern MinGW and MinGW-W64\n> (including x86_64!).\n\nTo make it easier to review and substantially easier to work on this patch\nseries with Git, I opened a pull request on GitHub:\n\n\thttps://github.com/msysgit/git/pull/264\n\nCiao,\nJohannes\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250352","messageId":"54351544.9050907@virtuell-zuhause.de","threadId":"37649","inReplyTo":"20141008045330.GA5672@seldon","subject":"Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Thomas Braun","fromEmail":"thomas.braun@virtuell-zuhause.de","sentAt":"2014-10-08T10:43:16Z","receivedAt":"2014-10-08T10:43:16Z","isPatch":true,"sender":{"key":"thomas.braun@virtuell-zuhause.de","avatar":"https://avatars.githubusercontent.com/u/1185677?v=4"},"body":"Am 08.10.2014 um 06:53 schrieb Marat Radchenko:\n> On Wed, Oct 08, 2014 at 01:09:20AM +0200, Thomas Braun wrote:\n>> Am 30.09.2014 um 09:02 schrieb Marat Radchenko:\n>>> This patch series fixes building on modern MinGW and MinGW-W64 (including x86_64!).\n>>>\n>>> *Compilation* tested on:\n>>> - MSVC\n>>> - msysGit environment (twice)\n>>\n>> Hi Marat,\n>>\n>> I wanted to verify that on msysgit but some patches fail to apply\n>> cleanly. Did you also had to tweak the patches?\n>> If yes, are these tweaked patches still available somewhere?\n> \n> msysgit != git-for-windows, as msysgit folks say. msysgit is a development\n> environment for git-for-windows.\n\nI surely know that!\n\n> I tested my patches by applying them to git.git/master and building\n> inside msysgit.\n\nFine, but then please explicitly state that. Compiling \"git.git/master\nin msysgit\" and \"msysgit.git/master in msysgit\" are two different things.\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250353","messageId":"alpine.DEB.1.00.1410081251450.990@s15462909.onlinehome-server.info","threadId":"37649","inReplyTo":"20141008093258.GA6393@seldon","subject":"Re: Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2014-10-08T10:52:41Z","receivedAt":"2014-10-08T10:52:41Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Marat,\n\nOn Wed, 8 Oct 2014, Marat Radchenko wrote:\n\n> On Wed, Oct 08, 2014 at 10:59:57AM +0200, Johannes Schindelin wrote:\n>\n> > So the idea would be to rebase from git/git/master onto\n> > msysgit/git/master. Did you do that yet?\n> \n> No, what for?\n\nTo work together?\n\nIf you are not interested in working together to make Git on 64-bit\nWindows kick-ass, just say so.\n\nCiao,\nJohannes\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250354","messageId":"20141008105901.GA9433@seldon","threadId":"37649","inReplyTo":"alpine.DEB.1.00.1410081139330.990@s15462909.onlinehome-server.info","subject":"Re: [PATCH v4] MinGW(-W64) compilation","fromName":"Marat Radchenko","fromEmail":"marat@slonopotamus.org","sentAt":"2014-10-08T10:59:01Z","receivedAt":"2014-10-08T10:59:01Z","isPatch":true,"sender":{"key":"marat@slonopotamus.org","avatar":"https://avatars.githubusercontent.com/u/92637?v=4"},"body":"On Wed, Oct 08, 2014 at 11:40:17AM +0200, Johannes Schindelin wrote:\n> To make it easier to review and substantially easier to work on this patch\n> series with Git, I opened a pull request on GitHub:\n>\n> https://github.com/msysgit/git/pull/264\n>\n\n1. I fail to see how using a tool that doesn't send emails about review\n comments is *easier* than just sending emails.\n\n2. Please, do not hijack patchset discussion by moving it from git@ ML to \n GitHub comments.\n\n3. And I repeat, my goal is to push this stuff in git.git,\n not in msysgit.git, not in git-for-windows.git, not in msys2.git, not in other\n 4k+ forks on GitHub.\n\n-- \n-- \n*** Please reply-to-all at all times ***\n*** (do not pretend to know who is subscribed and who is not) ***\n*** Please avoid top-posting. ***\nThe msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.\n\nYou received this message because you are subscribed to the Google\nGroups \"msysGit\" group.\nTo post to this group, send email to msysgit@googlegroups.com\nTo unsubscribe from this group, send email to\nmsysgit+unsubscribe@googlegroups.com\nFor more options, and view previous threads, visit this group at\nhttp://groups.google.com/group/msysgit?hl=en_US?hl=en\n\n--- \nYou received this message because you are subscribed to the Google Groups \"Git for Windows\" group.\nTo unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com.\nFor more options, visit https://groups.google.com/d/optout.\n"},{"id":"250357","messageId":"alpine.DEB.1.00.1410081553320.990@s15462909.onlinehome-server.info","threadId":"37649","inReplyTo":"20141008105901.GA9433@seldon","subject":"Re: [msysGit] [PATCH v4] MinGW(-W64) compilation","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2014-10-08T13:58:17Z","receivedAt":"2014-10-08T13:58:17Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Marat,\n\nOn Wed, 8 Oct 2014, Marat Radchenko wrote:\n\n> On Wed, Oct 08, 2014 at 11:40:17AM +0200, Johannes Schindelin wrote:\n> > To make it easier to review and substantially easier to work on this patch\n> > series with Git, I opened a pull request on GitHub:\n> >\n> > https://github.com/msysgit/git/pull/264\n> >\n> \n> 1. I fail to see how using a tool that doesn't send emails about review\n> comments is *easier* than just sending emails.\n\nYou probably missed how I commented on exact lines without you having to\nguess from the quoted context what part of your patches I am talking\nabout.\n\nYou probably also missed the fact that comments on rewritten commits\nautomatically drop out of sight, decluttering the set of comments and\nmaking it obvious which comments have not been addressed yet.\n\nAnd finally, you probably also missed the fact that the official Git fork\nfor Windows was asked to review your patches because Junio defers\nWindows-specific stuff to us. And as you refused to work against our\nintegration branches (yes, we have two, because we are working towards\nswitching to a more sustainable development environment, something you\nalready mocked successfully), we had to rebase your work onto two\nbranches, which is also substantially easier to do using GitHub rather\nthan via mails.\n\nBut I get it: you want to roll your own thing and not help us review it\nlet alone make use of it. That's fine, we'll manage.\n\n> 2. Please, do not hijack patchset discussion by moving it from git@ ML to \n> GitHub comments.\n\nI mistook your work on Git and the fact that you have an account on GitHub\nfor your willingness to collaborate on this effectively. My mistake, I\napologize!\n\n> 3. And I repeat, my goal is to push this stuff in git.git,\n> not in msysgit.git, not in git-for-windows.git, not in msys2.git, not in other\n> 4k+ forks on GitHub.\n\nYes, your objection is noted.\n\nJunio, we'll take it from here, don't worry.\n\nCiao,\nJohannes\n"}]}