{"thread":{"id":"24296","subject":"[PATCH 2/2] Modify MSVC wrapper script","startedAt":"2010-07-05T19:41:36Z","lastAt":"2010-07-06T10:12:30Z","messageCount":4,"participants":["Peter Harris","Johannes Sixt","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"144843","messageId":"1278358897-488-1-git-send-email-pharris@opentext.com","threadId":"24296","inReplyTo":null,"subject":"[PATCH 1/2] Fix MSVC build","fromName":"Peter Harris","fromEmail":"pharris@opentext.com","sentAt":"2010-07-05T19:41:36Z","receivedAt":"2010-07-05T19:41:36Z","isPatch":true,"sender":{"key":"pharris@opentext.com","avatar":"https://gravatar.com/avatar/ce4904dee5af2425a32fe0a6e3cefa7895a043d4d97d14dcd7425986bd41ba04?d=mp&s=160"},"body":"Signed-off-by: Peter Harris <pharris@opentext.com>\n---\n compat/mingw.h |    2 ++\n 1 files changed, 2 insertions(+), 0 deletions(-)\n\ndiff --git a/compat/mingw.h b/compat/mingw.h\nindex 8104039..08fea02 100644\n--- a/compat/mingw.h\n+++ b/compat/mingw.h\n@@ -14,11 +14,13 @@ typedef int uid_t;\n #define S_ISSOCK(x) 0\n \n #ifndef _STAT_H_\n+#ifndef S_IRUSR\n #define S_IRUSR 0\n #define S_IWUSR 0\n #define S_IXUSR 0\n #define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR)\n #endif\n+#endif\n #define S_IRGRP 0\n #define S_IWGRP 0\n #define S_IXGRP 0\n-- \n1.7.1.msysgit.0.4.gea744.MSVC\n"},{"id":"144842","messageId":"1278358897-488-2-git-send-email-pharris@opentext.com","threadId":"24296","inReplyTo":"1278358897-488-1-git-send-email-pharris@opentext.com","subject":"[PATCH 2/2] Modify MSVC wrapper script","fromName":"Peter Harris","fromEmail":"pharris@opentext.com","sentAt":"2010-07-05T19:41:37Z","receivedAt":"2010-07-05T19:41:37Z","isPatch":true,"sender":{"key":"pharris@opentext.com","avatar":"https://gravatar.com/avatar/ce4904dee5af2425a32fe0a6e3cefa7895a043d4d97d14dcd7425986bd41ba04?d=mp&s=160"},"body":"This reduces warnings, and supports additional linker\nflags (such as -DEBUG and -MAP)\n\nSigned-off-by: Peter Harris <pharris@opentext.com>\n---\n Makefile                        |    1 +\n compat/vcbuild/scripts/clink.pl |    7 ++++++-\n 2 files changed, 7 insertions(+), 1 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 7134509..d4fd4b0 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1073,6 +1073,7 @@ ifndef DEBUG\n \tAR += -LTCG\n else\n \tBASIC_CFLAGS += -Zi -MTd\n+\tBASIC_LDFLAGS = -DEBUG -MAP\n endif\n \tX = .exe\n endif\ndiff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl\nindex 4374771..3f51886 100644\n--- a/compat/vcbuild/scripts/clink.pl\n+++ b/compat/vcbuild/scripts/clink.pl\n@@ -12,10 +12,14 @@\n use strict;\n my @args = ();\n my @cflags = ();\n+my @lflags = ();\n my $is_linking = 0;\n+my %linkflag = ( '-DEBUG' => 1, '-MAP' => 1 );\n while (@ARGV) {\n \tmy $arg = shift @ARGV;\n-\tif (\"$arg\" =~ /^-[DIMGO]/) {\n+\tif ($linkflag{$arg}) {\n+\t\tpush(@lflags, $arg);\n+\t} elsif (\"$arg\" =~ /^-[DIMGOWZ]/) {\n \t\tpush(@cflags, $arg);\n \t} elsif (\"$arg\" eq \"-o\") {\n \t\tmy $file_out = shift @ARGV;\n@@ -44,6 +48,7 @@ while (@ARGV) {\n }\n if ($is_linking) {\n \tunshift(@args, \"link.exe\");\n+\tpush(@args, @lflags);\n } else {\n \tunshift(@args, \"cl.exe\");\n \tpush(@args, @cflags);\n-- \n1.7.1.msysgit.0.4.gea744.MSVC\n"},{"id":"144874","messageId":"4C32C53C.8020105@viscovery.net","threadId":"24296","inReplyTo":"1278358897-488-1-git-send-email-pharris@opentext.com","subject":"Re: [PATCH 1/2] Fix MSVC build","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2010-07-06T05:55:08Z","receivedAt":"2010-07-06T05:55:08Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 7/5/2010 21:41, schrieb Peter Harris:\n> Signed-off-by: Peter Harris <pharris@opentext.com>\n> ---\n>  compat/mingw.h |    2 ++\n>  1 files changed, 2 insertions(+), 0 deletions(-)\n> \n> diff --git a/compat/mingw.h b/compat/mingw.h\n> index 8104039..08fea02 100644\n> --- a/compat/mingw.h\n> +++ b/compat/mingw.h\n> @@ -14,11 +14,13 @@ typedef int uid_t;\n>  #define S_ISSOCK(x) 0\n>  \n>  #ifndef _STAT_H_\n> +#ifndef S_IRUSR\n>  #define S_IRUSR 0\n>  #define S_IWUSR 0\n>  #define S_IXUSR 0\n>  #define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR)\n>  #endif\n> +#endif\n>  #define S_IRGRP 0\n>  #define S_IWGRP 0\n>  #define S_IXGRP 0\n\nThis doesn't apply: I don't see the #ifndef _STAT_H_ brackets anywhere in\nmy version of compat/mingw.h.\n\n-- Hannes\n"},{"id":"144893","messageId":"alpine.DEB.1.00.1007061211590.2326@intel-tinevez-2-302","threadId":"24296","inReplyTo":"4C32C53C.8020105@viscovery.net","subject":"Re: [msysGit] Re: [PATCH 1/2] Fix MSVC build","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2010-07-06T10:12:30Z","receivedAt":"2010-07-06T10:12:30Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 6 Jul 2010, Johannes Sixt wrote:\n\n> Am 7/5/2010 21:41, schrieb Peter Harris:\n> > Signed-off-by: Peter Harris <pharris@opentext.com>\n> > ---\n> >  compat/mingw.h |    2 ++\n> >  1 files changed, 2 insertions(+), 0 deletions(-)\n> > \n> > diff --git a/compat/mingw.h b/compat/mingw.h\n> > index 8104039..08fea02 100644\n> > --- a/compat/mingw.h\n> > +++ b/compat/mingw.h\n> > @@ -14,11 +14,13 @@ typedef int uid_t;\n> >  #define S_ISSOCK(x) 0\n> >  \n> >  #ifndef _STAT_H_\n> > +#ifndef S_IRUSR\n> >  #define S_IRUSR 0\n> >  #define S_IWUSR 0\n> >  #define S_IXUSR 0\n> >  #define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR)\n> >  #endif\n> > +#endif\n> >  #define S_IRGRP 0\n> >  #define S_IWGRP 0\n> >  #define S_IXGRP 0\n> \n> This doesn't apply: I don't see the #ifndef _STAT_H_ brackets anywhere in\n> my version of compat/mingw.h.\n\nObviously, this is a patch against 4msysgit's devel branch.\n\nHth,\nDscho\n"}]}