Re: [PATCH 3/3 v2] git-http-fetch: not a builtin

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, 28 Jul 2009, Johannes Schindelin wrote:

> Hi,
> 
> On Tue, 28 Jul 2009, Daniel Barkalow wrote:
> 
> > From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
> > 
> > This splits up git-http-fetch so that it isn't built-in.
> > 
> > It also removes the general dependency on curl, because it is no
> > longer used by any built-in code.
> > 
> > Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
> > Signed-off-by: Daniel Barkalow <barkalow@xxxxxxxxxxxx>
> > ---
> 
> I think there is something missing that was not needed in Linus' original 
> patch:
> 
> > diff --git a/Makefile b/Makefile
> > index d3dd2ed..3425336 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -979,10 +979,7 @@ else
> >  	else
> >  		CURL_LIBCURL = -lcurl
> >  	endif
> > -	BUILTIN_OBJS += builtin-http-fetch.o
> > -	PROGRAMS += git-shim-curl$X
> > -	EXTLIBS += $(CURL_LIBCURL)
> > -	LIB_OBJS += http.o http-walker.o
> > +	PROGRAMS += git-shim-curl$X git-http-fetch$X
> 
> So now, http is all excluded from libgit.a.  Okay.
> 
> > @@ -1487,6 +1484,9 @@ git-imap-send$X: imap-send.o $(GITLIBS)
> >  
> >  http.o http-walker.o http-push.o transport.o: http.h
> >  
> > +git-http-fetch$X: revision.o http.o http-push.o $(GITLIBS)
> > +	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
> > +		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
> 
> And git-http-fetch is linked to libcurl.  But why is git-shim-curl not 
> linked to libcurl?

It is linked to libcurl. Like git-http-push, it was already not relying on 
EXTLIBS including -lcurl.

	-Daniel
*This .sig left intentionally blank*
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]