threads / patch / 21387

patch, 4 partsMakefile: merge two Cygwin configuration sections into one

Subject: [PATCH 2/4] Makefile: merge two Cygwin configuration sections into one

## tl;dr

3 messages between Oct 27, 2009 and Nov 3, 2009. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Ramsay Jones· Oct 27, 2009, 19:11 UTC · lore

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---

I can't think of any potential problems with this... but I've added Dmitry to the cc-list, since he appears to have added the second cygwin section in adbc0b6b, just in case... ;-)

ATB, Ramsay Jones

 Makefile |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

Show changes to Makefile +2 −4

diff --git a/Makefile b/Makefile
index fea237b..8e1cfc5 100644
--- a/Makefile
+++ b/Makefile
@@ -782,6 +782,8 @@ ifeq ($(uname_O),Cygwin)
 	NO_MMAP = YesPlease
 	NO_IPV6 = YesPlease
 	X = .exe
+	COMPAT_OBJS += compat/cygwin.o
+	UNRELIABLE_FSTAT = UnfortunatelyYes
 endif
 ifeq ($(uname_S),FreeBSD)
 	NEEDS_LIBICONV = YesPlease
@@ -891,10 +893,6 @@ ifeq ($(uname_S),HP-UX)
 	NO_SYS_SELECT_H = YesPlease
 	SNPRINTF_RETURNS_BOGUS = YesPlease
 endif
-ifneq (,$(findstring CYGWIN,$(uname_S)))
-	COMPAT_OBJS += compat/cygwin.o
-	UNRELIABLE_FSTAT = UnfortunatelyYes
-endif
 ifdef MSVC
 	GIT_VERSION := $(GIT_VERSION).MSVC
 	pathsep = ;

-- 
1.6.5

Johannes Sixt· Nov 3, 2009, 07:22 UTC · re: Ramsay Jones · lore

Re: [PATCH 2/4] Makefile: merge two Cygwin configuration sections into one

Ramsay Jones schrieb:

Show 24 quoted lines

> diff --git a/Makefile b/Makefile
> index fea237b..8e1cfc5 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -782,6 +782,8 @@ ifeq ($(uname_O),Cygwin)
>  	NO_MMAP = YesPlease
>  	NO_IPV6 = YesPlease
>  	X = .exe
> +	COMPAT_OBJS += compat/cygwin.o
> +	UNRELIABLE_FSTAT = UnfortunatelyYes
>  endif
>  ifeq ($(uname_S),FreeBSD)
>  	NEEDS_LIBICONV = YesPlease
> @@ -891,10 +893,6 @@ ifeq ($(uname_S),HP-UX)
>  	NO_SYS_SELECT_H = YesPlease
>  	SNPRINTF_RETURNS_BOGUS = YesPlease
>  endif
> -ifneq (,$(findstring CYGWIN,$(uname_S)))
> -	COMPAT_OBJS += compat/cygwin.o
> -	UNRELIABLE_FSTAT = UnfortunatelyYes
> -endif
>  ifdef MSVC
>  	GIT_VERSION := $(GIT_VERSION).MSVC
>  	pathsep = ;

I think this an obviously good change even outside this series.

-- Hannes

Junio C Hamano· Nov 3, 2009, 07:46 UTC · re: Johannes Sixt · lore

Re: [PATCH 2/4] Makefile: merge two Cygwin configuration sections into one

Johannes Sixt <j.sixt@viscovery.net> writes:

Show 27 quoted lines

> Ramsay Jones schrieb:
>> diff --git a/Makefile b/Makefile
>> index fea237b..8e1cfc5 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -782,6 +782,8 @@ ifeq ($(uname_O),Cygwin)
>>  	NO_MMAP = YesPlease
>>  	NO_IPV6 = YesPlease
>>  	X = .exe
>> +	COMPAT_OBJS += compat/cygwin.o
>> +	UNRELIABLE_FSTAT = UnfortunatelyYes
>>  endif
>>  ifeq ($(uname_S),FreeBSD)
>>  	NEEDS_LIBICONV = YesPlease
>> @@ -891,10 +893,6 @@ ifeq ($(uname_S),HP-UX)
>>  	NO_SYS_SELECT_H = YesPlease
>>  	SNPRINTF_RETURNS_BOGUS = YesPlease
>>  endif
>> -ifneq (,$(findstring CYGWIN,$(uname_S)))
>> -	COMPAT_OBJS += compat/cygwin.o
>> -	UNRELIABLE_FSTAT = UnfortunatelyYes
>> -endif
>>  ifdef MSVC
>>  	GIT_VERSION := $(GIT_VERSION).MSVC
>>  	pathsep = ;
>
> I think this an obviously good change even outside this series.

Thanks; I think this one makes sense.