Re: [PATCH, resent] fix openssl headers conflicting with custom SHA1 implementations

From: Nicolas Pitre <nico@cam.org>
Date: Oct 1, 2008, 16:35 UTC
Message-ID: <alpine.LFD.2.00.0810011222090.3635@xanadu.home>
In-Reply-To: <20081001161047.GG21310@spearce.org>

On Wed, 1 Oct 2008, Shawn O. Pearce wrote:

Show 13 quoted lines

> Jeff King <peff@peff.net> wrote:
> > On Wed, Oct 01, 2008 at 08:54:58AM -0700, Shawn O. Pearce wrote:
> > 
> > > I think its easy enough to just rename our SHA_CTX and SHA_*
> > > functions to something more git specific.  Since its mostly a global
> > 
> > I think that is the cleanest and simplest solution. As for merging pain,
> > I think Junio would generally do a mechanical change like this as the
> > first thing after a release. However, in this case, I think we might
> > want it sooner if the conflict is causing breakage.
> 
> Oh, yea, that's probably true.  But with ARM broken according to
> Nico I'd almost just want this fixed in the upcoming 1.6.1 release.

Not only ARM, but PPC as well, and any configuration using the Mozilla SHA1 implementation and linking openssl (although I don't know why one would want that in the later case).

> Its simple enough to do.  We can even do something like this during
> the transition period until right before the 1.6.1 final:

Because it's easy to do then I'd do it sooner than later. Right now the master branch is broken for ARM and PPC which is not nice. And I don't think there is much work to be merged which would conflict with such a change.

Nicolas