From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 05 May 2006 07:57:54 GMT
Subject: Re: [PATCH] Fix linking with OpenSSL
Message-ID: <20060505075754.GA7237@mipter.zuzino.mipt.ru>
In-Reply-To: <7vslnp2y5x.fsf@assigned-by-dhcp.cox.net>

On Thu, May 04, 2006 at 04:00:26PM -0700, Junio C Hamano wrote:
> Junio C Hamano <junkio@cox.net> writes:
> > Alexey Dobriyan <adobriyan@gmail.com> writes:
> >> For those who put it into interesting (read: default) place.
> >>
> >> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
> >>
> >> --- a/Makefile
> >> +++ b/Makefile
> >> @@ -559,7 +559,7 @@ git-http-push$X: revision.o http.o http-
> >>  
> >>  git-rev-list$X: rev-list.o $(LIB_FILE)
> >>  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
> >> -		$(LIBS) $(OPENSSL_LIBSSL)
> >> +		$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL)
> >>  
> >>  init-db.o: init-db.c
> >>  	$(CC) -c $(ALL_CFLAGS) \
> >
> > We used to depend on bignum from openssl for rev-list
> > (merge-order), and if I remember correctly that was the only
> > reason built recipe for rev-list is different from other
> > programs.  I wonder if we can just get rid of this thing, and
> > have it built with git-%$X rule like everybody else.
> >
> > Can somebody try that out and report what happens?
> 
> Well, I did.  Alexey, does this work for you?

It does. It also crashes busybox patch applet. Oh, well...

> --- a/Makefile
> +++ b/Makefile
> @@ -564,10 +564,6 @@ git-http-push$X: revision.o http.o http-
>  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
>  		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
>  
> -git-rev-list$X: rev-list.o $(LIB_FILE)
> -	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
> -		$(LIBS) $(OPENSSL_LIBSSL)
> -
>  init-db.o: init-db.c
>  	$(CC) -c $(ALL_CFLAGS) \
>  		-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c