Re: [PATCH] 0003 This patch is to allow 12 different OS's to compile and run git.

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 7, 2008, 02:12 UTC
Message-ID: <7vzlpyouwf.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <Pine.LNX.4.64.0806061922290.18454@xenau.zenez.com>

Boyd Lynn Gerber <gerberb@zenez.com> writes:

Show 48 quoted lines

> On Fri, 6 Jun 2008, Daniel Barkalow wrote:
>
>> On Fri, 6 Jun 2008, Boyd Lynn Gerber wrote:
>> 
>> > From db0574a7f89bb90b6ce02cd44053f8cec2c454cc
>> > 
>> > This patch has patches to
>> > 
>> > Makefile
>> > git-compat-util.h
>> > progress.c
>> > 
>> > This patch allows some older OS's, SCO OpenServer 5.0.X, SCO UnixWare 7.1.4,
>> > and OpenServer 6.0.X to build and run git.  Applied suggestions from list.
>> > 
>> >         Developer's Certificate of Origin 1.1
>> > 
>> >         By making a contribution to this project, I certify that:
>> > 
>> >         (a) The contribution was created in whole or in part by me and I
>> >             have the right to submit it under the open source license
>> >             indicated in the file; or
>> > 
>> >         (b) The contribution is based upon previous work that, to the best
>> >             of my knowledge, is covered under an appropriate open source
>> >             license and I have the right under that license to submit that
>> >             work with modifications, whether created in whole or in part
>> >             by me, under the same open source license (unless I am
>> >             permitted to submit under a different license), as indicated
>> >             in the file; or
>> > 
>> >         (c) The contribution was provided directly to me by some other
>> >             person who certified (a), (b) or (c) and I have not modified
>> >             it.
>> > 
>> >         (d) I understand and agree that this project and the contribution
>> >             are public and that a record of the contribution (including all
>> >             personal information I submit with it, including my sign-off) is
>> >             maintained indefinitely and may be redistributed consistent with
>> >             this project or the open source license(s) involved.
>> > 
>> > Signed-off-by: Boyd Lynn Gerber <gerberb@zenez.com>
>> > 
>> > --
>> > Boyd Gerber <gerberb@zenez.com>
>> > ZENEZ   1042 East Fort Union #135, Midvale Utah  84047
>
> OK made changes you recommended.

I guess the patch text itself seems to be getting reasonable, and perhaps the next few rounds would be to fix the commit log message ;-)

Show 13 quoted lines

> diff --git a/Makefile b/Makefile
> index cce5a6e..000bf1f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -165,6 +165,11 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
>  # CFLAGS and LDFLAGS are for the users to override from the command line.
>  
>  CFLAGS = -g -O2 -Wall
> +ifeq ($(uname_S),SCO_SV)
> +	ifeq ($(uname_R),3.2)
> +		CFLAGS = -O2
> +	endif
> +endif

What makes SCO_SV so special that this platform specific tweak does not live in "Platform specific tweaks" section like others?

CFLAGS is for the user to oerride from the command line, and I do not very much like any tweaks in Makefile. I'd suggest dropping this hunk.

Show 6 quoted lines

> @@ -564,6 +569,42 @@ endif
>  ifeq ($(uname_S),GNU/kFreeBSD)
>  	NO_STRLCPY = YesPlease
>  endif
> +ifeq ($(uname_S),UnixWare)
> +	CC=cc

s/=/ = /; you have similar one elsewhere.

Show 8 quoted lines

> +	NEEDS_SOCKET = YesPlease
> +	NEEDS_NSL = YesPlease
> +	NEEDS_SSL_WITH_CRYPTO = YesPlease
> +	NEEDS_LIBICONV = YesPlease
> +	SHELL_PATH = /usr/local/bin/bash
> +	NO_IPV6 = YesPlease
> +	NO_HSTRERROR = YesPlease
> +	BASIC_CFLAGS +=  -Kalloca -Kthread

I am only guessing what -Kalloca is, but is it for alloca(3), and if so do you still need it?

Show 13 quoted lines

> diff --git a/git-compat-util.h b/git-compat-util.h
> index 01c4045..b3cd7b3 100644
> --- a/git-compat-util.h
> +++ b/git-compat-util.h
> @@ -39,7 +39,12 @@
>  /* Approximation of the length of the decimal representation of this type. */
>  #define decimal_length(x)	((int)(sizeof(x) * 2.56 + 0.5) + 1)
>  
> -#if !defined(__APPLE__) && !defined(__FreeBSD__)
> +/* Added for __USLC__ for any Novell devrived Compiler and Some Sys V 
> +   Added _M_UNIX for any XENIX/SCO UNIX/OpenServer less than or equal
> +   OpenServer 5.0.7  This is do avoided compiler hell like the other
> +   OS's __APPLE__ and __FreeBSD__ */

We generally do not do changelog inside the code comment.

> +#if !defined(__APPLE__) && !defined(__FreeBSD__)  && !defined(__USLC__) && !de
> +fined(_M_UNIX)

Linewrapped patch?  It is very curious that you have + in front of "fined(_M_UNIX)".